]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem' into crem2
authoryomguy <yomguy@parisson.com>
Wed, 13 Mar 2013 14:26:16 +0000 (15:26 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 13 Mar 2013 14:26:16 +0000 (15:26 +0100)
commite93000e34714a91107ed37f84810d97afb9befba
treebf46b71cdd7a5acbc2465da39f86da67ed1d7934
parent0de72a50d9079ed440ad1f6e443b930219d13aa3
parentef77560be9c2d635abd5ae6246b6b82a1aa31c0c
Merge branch 'crem' into crem2

Conflicts:
telemeta/models/media.py
telemeta/views/core.py
setup.py
telemeta/models/media.py
telemeta/templates/telemeta/collection_detail.html
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/views/core.py
telemeta/views/home.py
telemeta/views/item.py