From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 2 Oct 2018 15:07:39 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8e4440b3e90ad6f1d9ec5d4668ea11a933b8002c;p=mezzo.git

Merge branch 'dev'
---

8e4440b3e90ad6f1d9ec5d4668ea11a933b8002c
diff --cc .gitmodules
index 7e3129ea,53cf1ea1..dfb26951
--- a/.gitmodules
+++ b/.gitmodules
@@@ -23,9 -23,9 +23,9 @@@
      ignore = dirty
  [submodule "lib/grappelli-safe"]
      path = lib/grappelli-safe
 -    url = git@github.com:Ircam-Web/grappelli-safe.git
 +    url = https://github.com/Ircam-Web/grappelli-safe.git
      branch-master = dynamic_stacked
-     branch-dev = dynamic_stacked
+     branch-dev = dynamic_stacked-dev
      ignore = dirty
  [submodule "lib/mezzanine-organization"]
      path = lib/mezzanine-organization