diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-05 22:17:44 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-05 22:17:44 +0100 |
| commit | 9ce61bc6de5e98397e84c24a00d30002d4e04de5 (patch) | |
| tree | 8ab9d19530ca3026fb21aff1993982f487dc7a28 /chimere/forms.py | |
| parent | 2ca084384e6bf0596822938a607a189b507f60ed (diff) | |
| parent | 89c4baf537a590dbe80c5f6a4c20f202c63ebb15 (diff) | |
| download | Chimère-9ce61bc6de5e98397e84c24a00d30002d4e04de5.tar.bz2 Chimère-9ce61bc6de5e98397e84c24a00d30002d4e04de5.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/actions.py
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/urls.py
chimere/utils.py
chimere/views.py
Diffstat (limited to 'chimere/forms.py')
0 files changed, 0 insertions, 0 deletions