summaryrefslogtreecommitdiff
path: root/archaeological_files
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-06 16:53:10 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-06 16:53:10 +0100
commit67208dbd830ce4eb75d77f59d1ffd31c63b19d80 (patch)
treecff73359a85d362bd3b24f853fb6d461a583b91b /archaeological_files
parent161d29195cb9719b9c6ae4903c2c526f797bdf5f (diff)
parentad5d9f7c0d5b0ca5a0ba76e279fc5d6e2683216a (diff)
downloadIshtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.tar.bz2
Ishtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_files')
-rw-r--r--archaeological_files/tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index 8a4c105c6..2b0a63af8 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -25,7 +25,8 @@ import json
from django.conf import settings
from django.contrib.auth.models import User
-from django.test import TestCase
+
+from ishtar_common.tests import TestCase
from ishtar_common.models import PersonType, Town, IshtarSiteProfile
from archaeological_files import models