]> git.parisson.com Git - telecaster-instance.git/commit
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-instance into dev
authoryomguy <yomguy@parisson.com>
Wed, 19 Jul 2017 22:54:56 +0000 (00:54 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 19 Jul 2017 22:54:56 +0000 (00:54 +0200)
commit0c89fe483e22633fcb28a733b579286af945def6
tree6f5dd17ded7589bbf261f747cc994c157d8dfab3
parent647a700f2a85a9ff7d8277a68f1795aec40b0a88
parent0ce11bfe9fda61ba3c18d425f0a8dde18bdcb66c
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-instance into dev

Conflicts:
.gitignore
settings.py
.gitignore
settings.py