]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 10 Oct 2016 14:58:19 +0000 (16:58 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 10 Oct 2016 14:58:19 +0000 (16:58 +0200)
commit57b9f611ecb8382c9737ce035275462dc22a4bc4
tree0bcbc899fdb966fe13a08aaa497d289810b66ea0
parent972646f4936e838ea751f6f0eb08ac2fce6cd452
parent5d2f06523d398523f53221b6c087fb92f05c8fca
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

Conflicts:
app/templates/agenda/event_list.html