]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bdea41 5fe48d9)
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Mon, 13 Feb 2012 22:09:02 +0000 (23:09 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 13 Feb 2012 22:09:02 +0000 (23:09 +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.