]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 8 Mar 2017 17:34:41 +0000 (18:34 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 8 Mar 2017 17:34:41 +0000 (18:34 +0100)
1  2 
etc/nginx/conf.d/default.conf

Simple merge