]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82c8426 03ca023)
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Wed, 2 May 2012 14:31:23 +0000 (16:31 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 2 May 2012 14:31:23 +0000 (16:31 +0200)
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.