]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authorThomas Fillon <thomas@parisson.com>
Fri, 2 Jun 2017 16:46:22 +0000 (18:46 +0200)
committerThomas Fillon <thomas@parisson.com>
Fri, 2 Jun 2017 16:46:22 +0000 (18:46 +0200)
commit06b7a74b8ae86444bfde87fab4266300564b2415
treed83ca2ae6cf2a95d0506f94704c265ad072b2122
parent4a4adc84fe90c6c221201d39f8a6f67e0acef09e
parenta27363fd59e3d3cfbaa967bb5ed1641ecdb0949a
Merge branch 'dev' into crem
app/settings.py