From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 22 Feb 2018 12:25:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8237357eb0f7c24ecfe8066e050cfcaf2951d5aa;p=telemeta.git

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

8237357eb0f7c24ecfe8066e050cfcaf2951d5aa
diff --cc docker-compose.yml
index 83911003,47d88e97..7f1de7cb
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -84,9 -79,9 +84,9 @@@ worker
  nginx:
    image: nginx
    ports:
 -    - "8000:80"
 +    - "8001:80"
    volumes:
-     - ./etc/nginx.conf:/etc/nginx/conf.d/default.conf
+     - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
    volumes_from:
      - data
    links: