]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
authorPhilippe Barbosa <contact@philippebarbosa.com>
Tue, 22 Mar 2016 17:59:02 +0000 (18:59 +0100)
committerPhilippe Barbosa <contact@philippebarbosa.com>
Tue, 22 Mar 2016 17:59:02 +0000 (18:59 +0100)
commit127e05416bc265cd2549e79f4dab8389441aba2d
tree6756d294f86d1aba0ba35128a1c0ab76cc1257ba
parent8c169e834a86ca493a7e79246cb23daf6ebab04f
parentc9a7888e8ca29cf8d31b95de10bf9ab1b5111f59
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
app/templates/agenda/event_list.html
app/templates/base.html