]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/dj1.8
authorThomas Fillon <thomas@parisson.com>
Mon, 16 Jan 2017 09:41:24 +0000 (10:41 +0100)
committerThomas Fillon <thomas@parisson.com>
Mon, 16 Jan 2017 09:41:24 +0000 (10:41 +0100)
commitf69accce5943a8ebe1718e06e94b8191e8610312
treea7a1e5e26c6cc2c15f1c712b0f64a85e9516a02f
parent71f04af2ea6f01ea4d17e5e8da299d9197072015
parent76197f7e37c76dbf75409423e107fd2e0b0fc425
Merge branch 'dev' into feature/dj1.8
app/settings.py