]> git.parisson.com Git - mezzo.git/commit
resolve conficts
authorEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 14:00:47 +0000 (15:00 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 14:00:47 +0000 (15:00 +0100)
commitae66f9bde45c68223fd665919d5ed7aad6ad01d8
tree49d9323730c92cf8583bf6f18aa17e8b521d453c
parent34f636e36a02dc0c0494d5e3feb27a0b50978a79
parente50ec3114dd2c3c11dd8da11dbbf38c209781451
resolve conficts
.gitmodules
app/local_settings.py