]> git.parisson.com Git - mezzo.git/commit
resolve conflicts
authorEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 15:18:57 +0000 (16:18 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 15:18:57 +0000 (16:18 +0100)
commit8766f44410830fef11f021257e88bb38f373a19b
treefc3c5eb4adb14373abc47937943096eda997ea09
parentec4b9022fd7ab98837b65dfb2e7d4a59cf424f9f
parent8ece122da922f20f67f93026c86658b740588feb
resolve conflicts
app/settings.py