From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 20 Jan 2016 19:40:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a9aa0d10f8c706298e99e45d3bad352087bd9795;p=telemeta.git

Merge remote-tracking branch 'origin/dev' into crem

Conflicts:
	docker-compose.yml
---

a9aa0d10f8c706298e99e45d3bad352087bd9795
diff --cc docker-compose.yml
index 69714788,623f5088..389f5977
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -22,12 -22,12 +22,12 @@@
  # Thomas Fillon <thomas@parisson.com>
  
  
- media:
+ data:
    image: debian:jessie
    volumes:
 -     - ./data/media/:/srv/media
 -     - ./data/static/:/srv/static
 -     - ./data/backup/:/srv/backup
 +     - /home/parisson/CREM/Telemeta/media/:/srv/media
 +     - ./static/:/srv/static
 +     - /home/parisson/CREM/Telemeta/backup/:/srv/backup
    command: "true"
  
  db: