]> git.parisson.com Git - mezzo.git/commit
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)
commitc4523b19a85f41b8cc3e325b53370e06a53f71b2
tree5e1203aa4f248b77f6617dfde6e91eddd5fe31bd
parent931b2a9bacd0f214eea2a8cba93d8376a686cc6d
parentaa47b3c3c41c7e36eff37a63b95771ea49083f94
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

# Conflicts:
# app/templates/pages/menus/current_tree_primary.html