]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev2' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 26 Dec 2013 14:46:16 +0000 (15:46 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 26 Dec 2013 14:46:16 +0000 (15:46 +0100)
commitb99b3510005a6770713d9a87d86fd7cc5687b763
treedca2fd3169209ec4cddc4216ee2d0e10e3c204cd
parente07c791f015b97e9793489191ab3f1711711e141
parent54cb70ba46ee03ca0067a8ee6ff0b21f8c94b740
Merge branch 'dev2' into dev
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/models/media.py
telemeta/models/query.py
telemeta/templates/telemeta/collection_detail.html
telemeta/views/core.py
telemeta/views/instrument.py
telemeta/views/item.py