]> 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>
Thu, 26 Jan 2017 14:57:43 +0000 (15:57 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 26 Jan 2017 14:57:43 +0000 (15:57 +0100)
commitd03727458a6f632050f6db6f25f4ec1476fd6c19
tree6f5909d591f0a2a6d19e56d9a8805b7e87184a66
parent3432be9bd3345cab497b127ea9f58761ebbbd0b6
parent2512108d70149387dc14ea97722a96f5f37e0a32
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www

Conflicts:
docker-compose.yml
lib/mezzanine-agenda
var
app/local_settings.py