]> git.parisson.com Git - telecaster-instance.git/commit
Merge branch 'pb' into dev
authoryomguy <yomguy@parisson.com>
Thu, 28 Jun 2018 12:16:22 +0000 (14:16 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 28 Jun 2018 12:16:22 +0000 (14:16 +0200)
commit42ca4493c2222fd643d21a7fd12773fcedba7adc
treef99f0d5454bd9c6f2ff3e754704639ba9872166c
parent0ce11bfe9fda61ba3c18d425f0a8dde18bdcb66c
parentfed3e1e246a72fd0874e510afcaee8d43fae580d
Merge branch 'pb' into dev

Conflicts:
settings.py
settings.py