From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 14 Dec 2015 08:16:36 +0000 (+0100)
Subject: increase proc num, goto port 8001
X-Git-Tag: 1.6b~7^2~39^2~3^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=20f356b3ba5d0bcd16ac383eddf444cec6a0324a;p=telemeta.git

increase proc num, goto port 8001
---

diff --git a/docker-compose.yml b/docker-compose.yml
index d79cb775..90060f81 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,7 +75,7 @@ worker:
 nginx:
   image: nginx
   ports:
-    - "8000:80"
+    - "8001:80"
   volumes:
     - ./app/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
     - ./log/:/var/log/nginx
diff --git a/telemeta/locale b/telemeta/locale
index 91973b13..4534a3d4 160000
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit 91973b13f9dc9405052727c0c525d342dee15562
+Subproject commit 4534a3d47e7909554637e87a637b1959db277941
diff --git a/telemeta/pages b/telemeta/pages
index f8324093..771dfcc5 160000
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5
+Subproject commit 771dfcc58e26f43a507c3bc48fcb5ddde55ca0b1