]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin/master' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 25 Apr 2016 14:35:26 +0000 (16:35 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 25 Apr 2016 14:35:26 +0000 (16:35 +0200)
commit873c25fe20217ef8a625b4420a189ac8b783618a
treeade424e3b004c5405e6ce596e87be4fcfa4da2ab
parentc357c27216cb66114f6b35fac9d6e3590f4dfdc1
parentf508cfc59b779520f1cc057049bbe8caa9a6a04d
Merge remote-tracking branch 'origin/master' into crem

Conflicts:
app/settings.py
telemeta/pages
app/settings.py
docker-compose.yml
env/debug.env