]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c169e8 c9a7888)
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)
1  2 
app/templates/agenda/event_list.html patch | diff1 | diff2 | blob | history
app/templates/base.html patch | diff1 | diff2 | blob | history

diff --cc app/templates/agenda/event_list.html
Simple merge
diff --cc app/templates/base.html
Simple merge
Unnamed repository; edit this file 'description' to name the repository.