]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' into prestashop
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 18 Oct 2016 15:43:53 +0000 (17:43 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 18 Oct 2016 15:43:53 +0000 (17:43 +0200)
Conflicts:
app/templates/agenda/includes/event_date.html

1  2 
app/local_settings.py
app/scripts/app.sh
docker-compose.yml

Simple merge
Simple merge
Simple merge