]> 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>
Thu, 3 Nov 2016 17:42:45 +0000 (18:42 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 17:42:45 +0000 (18:42 +0100)
commit6c099cf4ce0485b1e0ff5670ae1c6343ef29212f
tree22e13eaa91042bcea7d9c71fbc581e7cff21b0aa
parente23cef9c8b26e57ec45121a7e7b896a297fdfec6
parent863279713e8b189ea1a8d3536515d50a79b8db16
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
app/local_settings.py