]> 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, 8 Apr 2016 16:24:25 +0000 (18:24 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 8 Apr 2016 16:24:25 +0000 (18:24 +0200)
commitb7a67a89e123ef36ccec79ec3b5c36ae156c762b
tree863854349e068281e74858971c6e2a3ccb842fa9
parent0b5f64cd5f056b76e866d169058a9f15b465c75c
parent75e4f77e92603fa8101b8c029b2c6cd8073c1758
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

Conflicts:
app/festival/templates/festival/artist_detail.html
app/festival/templates/festival/artist_detail.html