]> 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>
Tue, 22 Mar 2016 17:08:27 +0000 (18:08 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 22 Mar 2016 17:08:27 +0000 (18:08 +0100)
commitfc90ae095af117ac7e4d7e0a3faf330eb40b4cdf
tree6e8fef380d6307c69706861af9f08b2863283db0
parent35e25ba7da3832321dc9e63476eef799ae0778b8
parenta9680defd0e67b7c46f8d9ab9d65e7bfbdf0f9b4
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

Conflicts:
app/templates/agenda/includes/event_metainfo.html
app/templates/agenda/includes/event_metainfo.html
app/templates/base.html