]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Dec 2013 22:11:51 +0000 (23:11 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Dec 2013 22:11:51 +0000 (23:11 +0100)
commit25718d3711907e7911b516f4a1a368aa75d94e56
tree58c7d6c7a0eb683af230328d8d9a1897082c3a3f
parent650efb7be0db5a72e00f0e87bef28af07eb98557
parentef4bdc028c48ecd77853761d7d1f81edb8e2ceae
Merge branch 'dev' into crem2
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/models/media.py
telemeta/urls.py