]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into release/1.7
authorThomas Fillon <thomas@parisson.com>
Wed, 5 Jul 2017 16:07:27 +0000 (18:07 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 5 Jul 2017 16:07:27 +0000 (18:07 +0200)
commit9b0826c97074e174649f46b6259c8370d7d5724b
tree2a06d462431351be0721fc9d27b1b4f660f358d8
parenta90d43aae7f9ed8e75b8b56d318d12c77a4a0e27
parent4a8645f58591090a42925c4976909022f54f6ba6
Merge branch 'dev' into release/1.7
app/scripts/app.sh
app/settings.py