]> 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>
Wed, 19 Oct 2016 17:24:12 +0000 (19:24 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Oct 2016 17:24:12 +0000 (19:24 +0200)
commit7db468f16ff4fea49ca11522152ab686546041e3
treeba31eb04bd0589d21602f2481eb48e68bb882bc7
parente6ec961675c0a039579f04d29d58b53e95fcb09e
parente930bb2d48a2b82cc34a181acb149f39392124ef
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

Conflicts:
app/templates/agenda/includes/event_date.html
app/templates/agenda/includes/event_date.html