]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)
commit121264b564efb5e8b3a99ad8fac0ce8743b9f3ad
tree9f9c36a31444e930b986399413224cc73dceec5f
parent7b85a7211a4ee1c132273d7522144b27f8d0cca2
parent0a9981bf355875e6c5f3d78959a9462e5b502728
Merge branch 'crfpa' into tc202

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