]> git.parisson.com Git - mezzo.git/commit
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)
commitac8fbfd4e03ecc6d179aea8fc04910fb207cc72f
tree838d892b5c290bc0fccb96d6f27ea52ccd68cb90
parent8f1c440df2aec6fe2f5f96f53a55338b0f04e18c
parentd0dda6583d01de68fb86029d3eb951526830201c
Merge branch 'dev' into prestashop

Conflicts:
app/templates/agenda/includes/event_date.html
app/local_settings.py
app/scripts/app.sh
docker-compose.yml