]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Wed, 2 May 2012 13:34:04 +0000 (15:34 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 2 May 2012 13:34:04 +0000 (15:34 +0200)
commit20ef7d80a27aceda8f8266b7404d0b37a7ecf7ca
tree8522866a13080769e7e66c140973709c5864104c
parent04ec8848d1218cc15dfadf6078b52fd4ec406ae1
parentc8cdfbe54294c8b8541b3b42de31c6ccea8b0198
Merge branch 'master' into dev
telemeta/models/media.py
telemeta/views/base.py