From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 3 Jan 2017 23:02:49 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=79355cc209591236b5520ea231ce2d870d577f53;p=mezzo.git

Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www

Conflicts:
	app/bin/app.sh
	docker-compose.yml
	var
---

79355cc209591236b5520ea231ce2d870d577f53
diff --cc .gitignore
index 45b65c2e,45b65c2e..93312a9c
--- a/.gitignore
+++ b/.gitignore
@@@ -15,6 -15,6 +15,7 @@@ develop-egg
  .thumbnails
  .tmp
  *.lock
++var
  
  # Installer logs
  pip-log.txt