]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 972646f 5d2f065)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 10 Oct 2016 14:58:19 +0000 (16:58 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 10 Oct 2016 14:58:19 +0000 (16:58 +0200)
Conflicts:
app/templates/agenda/event_list.html


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