]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dj1.6' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 29 Oct 2014 23:21:54 +0000 (00:21 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 29 Oct 2014 23:21:54 +0000 (00:21 +0100)
commit74fb95cb0d47a919eb18254d5b6c1926dce33552
tree9bc8158fc7b39cc18d1f189e3df1f611f1b7b203
parent846efe80f7452640de410e9883a930302165e727
parent4532c7e5739f313054c08719161650d62654ec43
Merge branch 'dj1.6' into crem2
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/templates/telemeta/base.html
telemeta/views/core.py
telemeta/views/item.py