]> 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)
commitc5c8eb356f518f350336e684a23f1660612cb108
tree98dd367132679726f53210ad89822c6d51a802c7
parentc0d8856f81dba09b2d70c1673ecfe525cdc8b5a6
parent7b14041f62d29cb5f2123af2de67b473d19c886a
[MERGE] : mezzo/dev into dev
.gitmodules
app/local_settings.py
app/settings.py