]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 23 Sep 2016 10:53:01 +0000 (12:53 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 23 Sep 2016 10:53:01 +0000 (12:53 +0200)
commit3602f29c717d0bccdbcf6b7ff9b95d2d42b31f5e
tree461842fc0f55bc8cd7398436b84ca7fbf7d10e22
parent7b251e547e820c5f51a1d01a20b8f122d44a1ff0
parent2b094e676ec0742aeaa1b4a618263f4c8b7185b6
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
app/settings.py