]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Wed, 18 Apr 2012 10:52:06 +0000 (12:52 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 18 Apr 2012 10:52:06 +0000 (12:52 +0200)
commit16e4e13bb489edb5f1161ee29dd358e73b855e3a
treee1b8d29957c48b2222601bb02bf0414ed2d3783b
parentc40285d7657ce9a29f4e677d51abd73a523fb1d2
parentaf2a6edb0d65c785ddcfb5e324d29383f4dab409
Merge branch 'master' into dev
telemeta/models/media.py
telemeta/views/base.py