diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-22 14:55:39 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-22 14:55:39 +0200 |
| commit | abb6ec27ed2e37aa0dbe87260af9bc84119cb0e3 (patch) | |
| tree | ec13e966aa15ebb4da76c93bcb353a7f392c4c4a /chimere/forms.py | |
| parent | 1091d481584af4662488ee83d7fa1421f8d1700c (diff) | |
| parent | 502cc25a0dc57a61289c245d653f96e2b3009efa (diff) | |
| download | Chimère-abb6ec27ed2e37aa0dbe87260af9bc84119cb0e3.tar.bz2 Chimère-abb6ec27ed2e37aa0dbe87260af9bc84119cb0e3.zip | |
Merge branch 'saclay' of ssh://daenerys.peacefrogs.net/var/local/git/chimere into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'chimere/forms.py')
0 files changed, 0 insertions, 0 deletions