]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 10 Nov 2011 11:02:05 +0000 (12:02 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 10 Nov 2011 11:02:05 +0000 (12:02 +0100)
1  2 
telemeta/models/media.py
telemeta/templates/telemeta_default/base.html

Simple merge