]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80aedd4 54e27d5)
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 6 Jan 2014 15:52:28 +0000 (16:52 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 6 Jan 2014 15:52:28 +0000 (16:52 +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.