]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin/dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Feb 2016 09:59:28 +0000 (10:59 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Feb 2016 09:59:28 +0000 (10:59 +0100)
commit5aeac7da929aa341f7213968fab3788365cb259c
treeb10da842a06dc492014fde737eba7808dc1c7538
parenteb4ea2c83be1e7d2b45974dd96e56a7ffe11643a
parent76d6249368e55ba6fc775810db4894905444357e
Merge remote-tracking branch 'origin/dev' into crem

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