]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' into prestashop
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 21 Sep 2016 13:46:09 +0000 (15:46 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 21 Sep 2016 13:46:09 +0000 (15:46 +0200)
commitcbbc39084cbae81074449b5d1d9fc13935cc85fb
tree2e580537f68325bc8c6fca69d61e12dc25a2805d
parent76869cb99b4e5ba5c92abd5db3d67b38984dfa73
parent79e068bfba50873e9ece4356a8c3b8be4fb9ff40
Merge branch 'dev' into prestashop
app/local_settings.py