diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-07-16 22:28:38 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-07-16 22:28:38 +0200 |
commit | 7e2f7de59cb0000b132f2e8767bc496431d1935f (patch) | |
tree | bcc5a05539d6cc7375a5dc9e8a3aea414c8ae525 /archaeological_files_pdl/forms.py | |
parent | 45c418d867ec7a0fda582686d2f33ba8a694a930 (diff) | |
parent | d058c10237b024961426e9f5344df8d214b29f51 (diff) | |
download | Ishtar-7e2f7de59cb0000b132f2e8767bc496431d1935f.tar.bz2 Ishtar-7e2f7de59cb0000b132f2e8767bc496431d1935f.zip |
Merge branch 'stable'
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'archaeological_files_pdl/forms.py')
0 files changed, 0 insertions, 0 deletions