]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2137166 4a3a09f)
Merge branch 'dev' into crem2
authoryomguy <yomguy@parisson.com>
Mon, 11 Feb 2013 10:30:12 +0000 (11:30 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 11 Feb 2013 10:30:12 +0000 (11:30 +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.