]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bb186b 698a134)
merge unstable (add conservation_site field to collection)
authoryomguy <yomguy@parisson.com>
Wed, 8 Jun 2011 14:42:25 +0000 (16:42 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 8 Jun 2011 14:42:25 +0000 (16:42 +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.