]> git.parisson.com Git - mezzo.git/commitdiff
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)
1  2 
app/local_settings.py
app/settings.py

Simple merge
diff --cc app/settings.py
Simple merge