]> git.parisson.com Git - telemeta.git/commit
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)
commit618d7ec4783116cac133617e53736c674364b7c8
treeb0f2512c5f9bf3cd739c827857b1708f7580c596
parent35abbfef64fd3eba43fa0fb2fd394a05b2ee964a
parentd082877968664263bff59ea7cefec647cf0b1fc7
Merge branch 'master' into crem
telemeta/models/media.py
telemeta/templates/telemeta_default/base.html