Merge branch 'vertigo' of git+ssh://git.forge.ircam.fr/mezzanine-organization into...

author Guillaume Pellerin <guillaume.pellerin@ircam.fr>

Tue, 28 Mar 2017 09:20:52 +0000 (11:20 +0200)

committer Guillaume Pellerin <guillaume.pellerin@ircam.fr>

Tue, 28 Mar 2017 09:20:52 +0000 (11:20 +0200)
author Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 28 Mar 2017 09:20:52 +0000 (11:20 +0200)
committer Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 28 Mar 2017 09:20:52 +0000 (11:20 +0200)
diff --cc app/locale/fr/LC_MESSAGES/django.mo

index 3d7eda47ff68ea095fc1cc1c77632b866460499e,6900e9b8da2e798a98eb7303475484433d91ebc1..f27b9a3b4086592ece49d6c88af09479df7af32e

Binary files differ
diff --cc docker-compose.yml
Simple merge
author	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Tue, 28 Mar 2017 09:20:52 +0000 (11:20 +0200)
committer	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Tue, 28 Mar 2017 09:20:52 +0000 (11:20 +0200)
		1	2
app/locale/fr/LC_MESSAGES/django.mo	patch \|	diff1 \|	diff2 \|	blob \| history
docker-compose.yml	patch \|	diff1 \|	diff2 \|	blob \| history