]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin/dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 20 Jan 2016 19:40:46 +0000 (20:40 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 20 Jan 2016 19:40:46 +0000 (20:40 +0100)
commita9aa0d10f8c706298e99e45d3bad352087bd9795
tree9378f314e485e2f1ee29f5330359c056377e9486
parent087933dc73cf3a3e10cdefeb649f0930b83a662b
parent52870f2be2f1c4efa3368492ed525fc8c0d5bd4c
Merge remote-tracking branch 'origin/dev' into crem

Conflicts:
docker-compose.yml
app/sandbox/settings.py
docker-compose.yml