]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin/crem' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Jun 2017 15:47:50 +0000 (17:47 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Jun 2017 15:47:50 +0000 (17:47 +0200)
commitc7204650495bcab496eff217f8894bfbc5d1ccba
tree554aab038590ea452d6091f00edf507362ead036
parent2cf26c3a3b85881ca2e9c3a7ca33f1d339f163cb
parent51b5c1772ebb4c6aa67d098dca509ca34c90f900
Merge remote-tracking branch 'origin/crem' into crem
app/settings.py