]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca06feb eaaaaae)
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Wed, 30 Nov 2011 10:06:44 +0000 (11:06 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 30 Nov 2011 10:06:44 +0000 (11:06 +0100)
Conflicts:
telemeta/models/media.py

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.