]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa1889e 5a819a6)
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Tue, 25 Sep 2012 10:12:46 +0000 (12:12 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 25 Sep 2012 10:12:46 +0000 (12:12 +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.