]> git.parisson.com Git - mezzo.git/commit
[MERGE] : mezzo/dev into dev
authorEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 11:40:48 +0000 (12:40 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 11:40:48 +0000 (12:40 +0100)
commit34f636e36a02dc0c0494d5e3feb27a0b50978a79
tree98dd367132679726f53210ad89822c6d51a802c7
parentc0d8856f81dba09b2d70c1673ecfe525cdc8b5a6
parent0a529a6c45db4d9e6120b3ac9398cf0d8277b41f
[MERGE] : mezzo/dev into dev
.gitmodules
app/local_settings.py
app/settings.py