diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-03-13 10:39:17 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-03-13 10:39:17 +0000 |
| commit | 9b927d3e22d6f574d560315357d25332d6546d5b (patch) | |
| tree | b394f356bdf32f00306704efcbf8ca835c58f66a /archaeological_operations/models.py | |
| parent | c0e64f5f1baef6cb373c391c71b3953c3abdddfa (diff) | |
| parent | 57a9896d4ec40ece311a90887532a11bd47d4420 (diff) | |
| download | Ishtar-9b927d3e22d6f574d560315357d25332d6546d5b.tar.bz2 Ishtar-9b927d3e22d6f574d560315357d25332d6546d5b.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 4342db912..20c8df16f 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -27,7 +27,7 @@ from django.utils.translation import ugettext_lazy as _, ugettext from ishtar_common.models import GeneralType, BaseHistorizedItem, \ HistoricalRecords, LightHistorizedItem, OwnPerms, Department, Source,\ - Person, Organization, Town, Dashboard + Person, Organization, Town, Dashboard, IshtarUser FILES_AVAILABLE = 'archaeological_files' in settings.INSTALLED_APPS if FILES_AVAILABLE: from archaeological_files.models import File |