]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' into postgres
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 7 Jul 2016 14:31:01 +0000 (16:31 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 7 Jul 2016 14:31:01 +0000 (16:31 +0200)
commit873da3028b2361ffc6910ccc383d3d2701d19ff9
tree78d02dda16e438b50dc46b13d029577047a03539
parent070a0471176079a7e22a24fcd238e305e6fae8b6
parente1490525418c4eb80855b6199bf6881034c236b0
Merge branch 'dev' into postgres
app/local_settings.py
app/settings.py