]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Fri, 27 Apr 2012 11:12:12 +0000 (13:12 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 27 Apr 2012 11:12:12 +0000 (13:12 +0200)
commit742435dd930cf297389cfdc53da86a7da2bed8a3
tree6e6a2672b5caef4c590f9a93d0daf16469bbdd7e
parent16e4e13bb489edb5f1161ee29dd358e73b855e3a
parentfad4d148e46985bf567789b1114d9783212de04d
Merge branch 'master' into dev
telemeta/models/media.py
telemeta/views/base.py