]> git.parisson.com Git - mezzo.git/commit
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)
commit15d386e1491c7aefb98ebcd645a72a7be98f152d
tree2eae4aac9c70ce1fbc99f7309b398f47ecf9d704
parente9a9bec91ca7640cb5d540a370425f2deaddbeb6
parent8a8f41a3c68204fb2aee75cac842dae2eb4f6629
Merge branch 'dev'
app/settings.py
etc/nginx/conf.d/default.conf