]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46e10cd f89237d)
Merge branch 'pages' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 24 Jul 2016 23:25:51 +0000 (01:25 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 24 Jul 2016 23:25:51 +0000 (01:25 +0200)
1  2 
app/organization/team/models.py patch | diff1 | diff2 | blob | history

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