]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' into prestashop
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 26 Sep 2016 14:39:34 +0000 (16:39 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 26 Sep 2016 14:39:34 +0000 (16:39 +0200)
commit1f2d2766ea824984033d8d0f4e0ea8091c1f63c8
tree5602ea5ed5009da26b6c8730ab9090ef8026b1cd
parentec23b26a3c313394dc27a625b87547ccba3744ca
parenta65e245fac87c90ec1a2afa8dbd45b6f5d4f53c1
Merge branch 'dev' into prestashop

Conflicts:
app/settings.py
lib/django-eve
app/local_settings.py
app/settings.py