]> git.parisson.com Git - mezzo.git/commit
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)
commit86424e1f0140e7887f2d2c046c66607289c89ce1
treeba495f70cc7c91b29af89f25976fc1eb4b883ea8
parent34b6f67b39dd26a49abf11fb791b1420370c0123
parent4122859020178d594369111601b8ca9459cd24bf
Merge branch 'dev'
etc/nginx/conf.d/default.conf