]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fdfde4 304eb2a)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 23 Sep 2016 15:41:20 +0000 (17:41 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 23 Sep 2016 15:41:20 +0000 (17:41 +0200)
1  2 
app/organization/pages/admin.py patch | diff1 | diff2 | blob | history

diff --cc app/organization/pages/admin.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.