From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 6 Apr 2018 08:20:56 +0000 (+0200)
Subject: Build on travis, update modules
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=96caaf648dd79f91cfa87effddf2e2580a5ff348;p=mezzo.git

Build on travis, update modules
---

diff --git a/.travis.yml b/.travis.yml
index f7ad0ff8..087caf3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ install:
 
 script:
   - docker-compose run app pip freeze
-  - docker-compose -f docker-compose.yml -f env/staging.yml up -d
+  - docker-compose -f docker-compose.yml -f env/build.yml up -d
   - docker-compose run app python manage.py test
   - sleep 180
   - curl --fail --retry 10 --retry-delay 5  -v "$(docker-compose port nginx 8040)/"
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 5520a2a1..a5675960 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 5520a2a1c2d252f4c52dcdea3431a620bca1b626
+Subproject commit a567596002b1be24c54518b8d36eff2569a48a95
diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization
index 09c4c7c4..e4a3a5ee 160000
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@ -1 +1 @@
-Subproject commit 09c4c7c45efc85e4ff025902478bd34b7e3e71dc
+Subproject commit e4a3a5ee9eafb88ec317073c262952d6d2110fb8
diff --git a/lib/mezzanine-organization-themes b/lib/mezzanine-organization-themes
index 898aa3f8..f0f08ec8 160000
--- a/lib/mezzanine-organization-themes
+++ b/lib/mezzanine-organization-themes
@@ -1 +1 @@
-Subproject commit 898aa3f81cb3db53992a77f0425f34f2cd8f7670
+Subproject commit f0f08ec810d9e412b74b036d3585386a226c0cc4