From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 18 Sep 2018 10:42:07 +0000 (+0200)
Subject: Merge branch 'dev' into test
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dc96898d570a2a795ee574cfca52e235a1447d83;p=mezzo.git

Merge branch 'dev' into test
---

dc96898d570a2a795ee574cfca52e235a1447d83
diff --cc docker-compose.yml
index d881b869,b7cc1074..b18221b8
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -58,8 -60,4 +60,4 @@@ app
      links:
          - db
      environment:
 -        - DEBUG=False
 +        - DEBUG=False
- 
- nginx:
-     image: nginx
-