]> git.parisson.com Git - mezzo.git/commit
Merge remote-tracking branch 'mezzo/dev' into dev
authorEmilie <zawadzki@ircam.fr>
Fri, 1 Dec 2017 11:27:26 +0000 (12:27 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 1 Dec 2017 11:27:26 +0000 (12:27 +0100)
commit55ef2d5cfa11fafc1a4a6e571a5d70bb5ea965ea
treeef253710546aa12cb0f18bb9a0e4e9c64c0675e7
parent94ed69f59f7af9a18a36ad8144e7fc4fb354eb87
parent95cf90216a49c232a3b51f14fa8524d01be17b02
Merge remote-tracking branch 'mezzo/dev' into dev
app/settings.py