]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:24:55 +0000 (17:24 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:24:55 +0000 (17:24 +0100)
commit51e7a241a5422bdbecc23a5adb8f76304c67f241
treeb4815575bd11385cd2a2e5873adfb4d6d928a55c
parent715171aa145ce6840db8038e3b5885fb399682bf
parent3cc3f4aa47b6c252697380e5f4c88a4755980c3f
Merge branch 'dev' into crem2

Conflicts:
telemeta/locale
telemeta/locale/de/LC_MESSAGES/django.po