]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e03105 41460a4)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 18 Mar 2016 14:49:18 +0000 (15:49 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 18 Mar 2016 14:49:18 +0000 (15:49 +0100)
Conflicts:
app/templates/agenda/event_detail.html

1  2 
app/templates/agenda/event_detail.html patch | diff1 | diff2 | blob | history

Unnamed repository; edit this file 'description' to name the repository.