From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 24 Sep 2019 06:56:57 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7175f778c2d7f27b5499901e4ffd0f7a5ebcdc85;p=mezzo.git

Merge branch 'dev'
---

7175f778c2d7f27b5499901e4ffd0f7a5ebcdc85
diff --cc .gitmodules
index c8cafad7,00fe4f49..72196492
--- a/.gitmodules
+++ b/.gitmodules
@@@ -23,9 -23,9 +23,9 @@@
      ignore = dirty
  [submodule "lib/mezzanine-organization"]
      path = lib/mezzanine-organization
 -    url = git@github.com:Ircam-Web/mezzanine-organization.git
 +    url = https://github.com/Ircam-Web/mezzanine-organization.git
      branch-master = master
-     branch-dev = docker
+     branch-dev = dev
      ignore = dirty
  [submodule "lib/cartridge"]
      path = lib/cartridge