diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-15 11:34:32 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-15 11:34:32 +0200 |
| commit | 54d6c8789255aa5500df6dc583a8fdbe96b8442a (patch) | |
| tree | 9b6101e1df20be739157df2c8d6f391119bf3e48 /archaeological_operations | |
| parent | c3e4c309deb686685e34a441445b6104ba4913a7 (diff) | |
| parent | c18fccf766ea9fd82ca82d8e4a7938c83512c416 (diff) | |
| download | Ishtar-54d6c8789255aa5500df6dc583a8fdbe96b8442a.tar.bz2 Ishtar-54d6c8789255aa5500df6dc583a8fdbe96b8442a.zip | |
Merge branch 'master' into develop
Conflicts:
archaeological_finds/forms_treatments.py
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/locale/django.pot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 13a161584..fafadea13 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -77,7 +77,7 @@ msgid "Relation type" msgstr "" #: forms.py:383 ishtar_menu.py:30 models.py:372 models.py:847 models.py:882 -#: models.py:922 models.py:1026 models.py:1235 wizards.py:353 wizards.py:364 +#: models.py:922 models.py:1026 models.py:1235 wizards.py:352 wizards.py:363 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" |