]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b260f34 5550a60)
Merge branch 'master' of git+ssh://git.forge.ircam.fr/mezzanine-organization
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 23 Mar 2017 17:48:06 +0000 (18:48 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 23 Mar 2017 17:48:06 +0000 (18:48 +0100)
1  2 
etc/nginx/conf.d/default.conf patch | diff1 | diff2 | blob | history

diff --cc etc/nginx/conf.d/default.conf
Simple merge
Unnamed repository; edit this file 'description' to name the repository.