diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-19 19:25:13 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-19 19:25:13 +0200 |
commit | 391b166c47cb2056a27962dfe12923584a5d2d3c (patch) | |
tree | 40ea87665a30e5bdfc32e78cd77c8d5c4e27d375 | |
parent | 047a7f9c3bc83f30b869315ac961058c87379c48 (diff) | |
parent | 351b4bd9eb774d9f42f017dd6816aded47c5e601 (diff) | |
download | Ishtar-391b166c47cb2056a27962dfe12923584a5d2d3c.tar.bz2 Ishtar-391b166c47cb2056a27962dfe12923584a5d2d3c.zip |
Merge branch 'stable'
-rw-r--r-- | ishtar_common/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 2174b1edb..a1f1c1129 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -990,7 +990,7 @@ if 'archaeological_files' in settings.INSTALLED_APPS: ] + MODELS if 'archaeological_context_records' in settings.INSTALLED_APPS: MODELS = [('archaeological_context_records.models.ContextRecord', - _(u"Archaeological files")), + _(u"Context records")), ] + MODELS def get_model_fields(model): |