]> git.parisson.com Git - mezzo.git/commit
projects / mezzo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 05f457b d495568)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Thu, 22 Sep 2016 15:49:00 +0000 (17:49 +0200)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Thu, 22 Sep 2016 15:49:00 +0000 (17:49 +0200)
commit852c37109a63a06fd38bdd4793e24f585181533a
tree59474c64957124e846b7b08759a93e1b3a71c166tree | snapshot
parent05f457b7a6126a7ac7d771c20e2463a531bc9dffcommit | diff
parentd495568c7c0ac2e88bb10d0cec3e7e62615f6264commit | diff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

# Conflicts:
# app/templates/projects/project_detail.html
app/templates/projects/project_detail.html diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.