]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 10 Dec 2014 17:06:57 +0000 (18:06 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 10 Dec 2014 17:06:57 +0000 (18:06 +0100)
commit715171aa145ce6840db8038e3b5885fb399682bf
tree5dbf97aa39fc82a482060b7690ac1b167b827194
parent74fb95cb0d47a919eb18254d5b6c1926dce33552
parentea33e9abb24193360f2db0162a9c2ac170c637d7
Merge branch 'dev' into crem2
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/templates/telemeta/base.html
telemeta/views/core.py
telemeta/views/item.py