]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4787f7a a65e245)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Mon, 26 Sep 2016 15:21:20 +0000 (17:21 +0200)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Mon, 26 Sep 2016 15:21:20 +0000 (17:21 +0200)
1  2 
app/templates/pages/custompage.html patch | diff1 | diff2 | blob | history

diff --cc app/templates/pages/custompage.html
Simple merge
Unnamed repository; edit this file 'description' to name the repository.