From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 26 Feb 2016 09:59:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5aeac7da929aa341f7213968fab3788365cb259c;p=telemeta.git

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

Conflicts:
	docker-compose.yml
---

5aeac7da929aa341f7213968fab3788365cb259c
diff --cc app/sandbox/tm-docker-compose.env
index 0719e665,465d6beb..7059bd06
--- a/app/sandbox/tm-docker-compose.env
+++ b/app/sandbox/tm-docker-compose.env
@@@ -8,7 -8,7 +8,7 @@@ MYSQL_PASSWORD=iuvIlkyisFit
  
  # -- DJANGO
  
--DEBUG=True
++DEBUG=False
  
  SECRET_KEY=ghv8us2587n97dq&w$c((o5rj_$-9#d-8j#57y_a9og8wux1h7
  
diff --cc docker-compose.yml
index 389f5977,0cc1d6c9..955e317c
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -25,9 -25,10 +25,10 @@@
  data:
    image: debian:jessie
    volumes:
 -     - ./data/media/:/srv/media
 -     - ./data/backup/:/srv/backup
 -     - /srv/static
 +     - /home/parisson/CREM/Telemeta/media/:/srv/media
 +     - ./static/:/srv/static
 +     - /home/parisson/CREM/Telemeta/backup/:/srv/backup
+      - /srv/bower
    command: "true"
  
  db:
diff --cc telemeta/pages
index f8324093,f8324093..4fcb6022
--- a/telemeta/pages
+++ b/telemeta/pages
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5
++Subproject commit 4fcb6022f8a1cf0780fc526737e84b8e690c1f88