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 | 15b722c99a45532f066dab777abb2c3e481719e9 (patch) | |
| tree | bcc5a05539d6cc7375a5dc9e8a3aea414c8ae525 /archaeological_files_pdl/urls.py | |
| parent | dab424b63294ea92a098fdccd5d8d67f8e51c8a6 (diff) | |
| parent | d12d2f85cad595e82476596f946937cff84f56a1 (diff) | |
| download | Ishtar-15b722c99a45532f066dab777abb2c3e481719e9.tar.bz2 Ishtar-15b722c99a45532f066dab777abb2c3e481719e9.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'archaeological_files_pdl/urls.py')
0 files changed, 0 insertions, 0 deletions