]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 931b2a9 aa47b3c)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Tue, 8 Nov 2016 10:33:07 +0000 (11:33 +0100)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Tue, 8 Nov 2016 10:33:07 +0000 (11:33 +0100)
# Conflicts:
# app/templates/pages/menus/current_tree_primary.html


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.