]> git.parisson.com Git - teleforma.git/commit
locale
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 07:41:58 +0000 (09:41 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 07:41:58 +0000 (09:41 +0200)
commitefb667c9e214ed4af48d096c59704b830dc729cf
tree0353f9ee22fd9a45b4502f0e488359a65a496356
parent34d9eeca7c5632e58541f2ae6b220a29bf041e41
parent3b9a2533313969178335fe75f3bca24436409762
locale
Merge branch 'crfpa' into tc202

Conflicts:
teleforma/locale/fr/LC_MESSAGES/django.mo
INSTALL.rst
teleforma/locale/fr/LC_MESSAGES/django.mo
teleforma/locale/fr/LC_MESSAGES/django.po
teleforma/models/core.py
teleforma/views/core.py