]> 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)
commit187c03238e88ce1730f9960625383f852b1cca7d
treefc3c5eb4adb14373abc47937943096eda997ea09
parent8e58c525f5bf2f0c0b10927ae220b69a61b1bd60
parent242c89f01260b6399515b2a910f21c46a52334ac
resolve conflicts
app/settings.py