]> 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)
commit75d0208cb26c6ff7ea13ff4188ded2d4913e9cd0
tree49d9323730c92cf8583bf6f18aa17e8b521d453c
parentc5c8eb356f518f350336e684a23f1660612cb108
parent93d0377d9742314902e35f546440c93f3a6f8bb2
resolve conficts
.gitmodules
app/local_settings.py