]> git.parisson.com Git - mezzo.git/commit
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 3 Jan 2017 23:02:49 +0000 (00:02 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 3 Jan 2017 23:02:49 +0000 (00:02 +0100)
commit79355cc209591236b5520ea231ce2d870d577f53
tree09280ae2fc0ff4c2fec58d66e1e5b2db76309ea6
parent8a0d30c36567dcb593cd7c2eb1283856342a3c69
parentd99d8688406003b2d0973e7edf08d16381c9f47a
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www

Conflicts:
app/bin/app.sh
docker-compose.yml
var
.gitignore
app/local_settings.py