]> 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>
Mon, 11 Apr 2016 12:26:10 +0000 (14:26 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 11 Apr 2016 12:26:10 +0000 (14:26 +0200)
commit07c97a2d78c6ba627894f7777b68ef2e3635eb0e
treecc06126a13a1d44f1c0445c94a2fe2be4f992708
parent9679b472a6f7f6f25c789f71cbfcb75076eb6fd1
parent972dec443b43ba10fd30c9f2d67e7bcdbda65e56
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

Conflicts:
app/festival/templates/festival/inc/artist_card.html
app/festival/templates/festival/inc/artist_card.html
lib/mezzanine-agenda