]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6c73e9 c8909ae)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into media-list
authorEmilie <zawadzki@ircam.fr>
Fri, 30 Sep 2016 13:25:26 +0000 (15:25 +0200)
committerEmilie <zawadzki@ircam.fr>
Fri, 30 Sep 2016 13:25:26 +0000 (15:25 +0200)
1  2 
app/organization/media/models.py patch | diff1 | diff2 | blob | history

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