]> git.parisson.com Git - mezzo.git/commit
fix conflict
authorPhilippe Barbosa <contact@philippebarbosa.com>
Tue, 22 Mar 2016 17:01:26 +0000 (18:01 +0100)
committerPhilippe Barbosa <contact@philippebarbosa.com>
Tue, 22 Mar 2016 17:01:26 +0000 (18:01 +0100)
commita9680defd0e67b7c46f8d9ab9d65e7bfbdf0f9b4
tree3c31023cc7af2a5b822a124da9731115551b316a
parent497fe2057ff7e84eef30537e61d0789c6199794b
parent7377f141220276ec933c30a249d5cf72156a9aae
fix conflict
app/templates/agenda/event_list.html
app/templates/base.html