]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' into prestashop
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 11 Oct 2016 13:08:51 +0000 (15:08 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 11 Oct 2016 13:08:51 +0000 (15:08 +0200)
commit7d6fc0fd96f89d2e511885d770fc1f5adaae8baf
treec4c3d613c27fa4243bb5d05a0be303cdb8cd59e7
parent6f69c3577c37f9b486415464895b1bf5b987011a
parent06a0b3b214178ec6ef3ecb6050909d22bcb83a6c
Merge branch 'dev' into prestashop

Conflicts:
requirements-dev.txt
app/local_settings.py
app/organization/core/management/commands/festival-sync-eve-events.py
app/settings.py