]> 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>
Thu, 29 Sep 2016 13:12:33 +0000 (15:12 +0200)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Thu, 29 Sep 2016 13:12:33 +0000 (15:12 +0200)
commit788cf64eac547e6eeb768f52a640ca5760a33727
treeeccf4ce2d5f53dff87e5d8c2932056c8d00a2aec
parent55df602274f121c53c6094018a55b4824445e672
parent9602df5ba97db589c2700cca0db23fc712d3540d
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

# Conflicts:
# app/templates/agenda/event_list.html
app/templates/agenda/event_list.html