]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 18 Mar 2016 14:49:18 +0000 (15:49 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 18 Mar 2016 14:49:18 +0000 (15:49 +0100)
commit79f1ad016c05c9fecca5fe420d17b1f3be3c04da
tree8548e85b47d4452a5e501132c25b4447f100b53e
parent4e03105acb96511ce0e932dc1744686e4669afc7
parent41460a47fab525cc99d809200a22e72f833d696c
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

Conflicts:
app/templates/agenda/event_detail.html
app/templates/agenda/event_detail.html