]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 28 Mar 2017 15:03:00 +0000 (17:03 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 28 Mar 2017 15:03:00 +0000 (17:03 +0200)
1  2 
app/settings.py
etc/nginx/conf.d/default.conf

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