]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0da5abe 8a2476d)
Merge branch 'crem2' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jan 2014 21:26:28 +0000 (22:26 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jan 2014 21:26:28 +0000 (22:26 +0100)
1  2 
telemeta/models/media.py patch | diff1 | diff2 | blob | history

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