]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Dec 2017 13:40:41 +0000 (14:40 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Dec 2017 13:40:41 +0000 (14:40 +0100)
commitfc33551f14080e7b5e7a69a08207b2e2e20225c1
treeef253710546aa12cb0f18bb9a0e4e9c64c0675e7
parent94ed69f59f7af9a18a36ad8144e7fc4fb354eb87
parent95cf90216a49c232a3b51f14fa8524d01be17b02
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
app/settings.py