]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 5 Jan 2017 17:10:01 +0000 (18:10 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 5 Jan 2017 17:10:01 +0000 (18:10 +0100)
commit91ba9ba43cabf03171f389bebf48abe35525266a
tree05332f29c4db1d9f4a6c058074581c318182dfd2
parent79355cc209591236b5520ea231ce2d870d577f53
parentc0a8594d69a4762f9dbf4d3d31a8dbbfc1a593e4
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www

Conflicts:
.gitignore
app/bin/app.sh
.gitignore
app/bin/init.sh
app/local_settings.py