]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49c4a14 6145505)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
authorPhilippe Barbosa <contact@philippebarbosa.com>
Wed, 6 Apr 2016 08:21:45 +0000 (10:21 +0200)
committerPhilippe Barbosa <contact@philippebarbosa.com>
Wed, 6 Apr 2016 08:21:45 +0000 (10:21 +0200)
1  2 
app/templates/base.html patch | diff1 | diff2 | blob | history

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