diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /example_project/settings.py | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index a191b83b3..437c75673 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -229,6 +229,8 @@ OP_PREFIX = 'OP' PRE_APPS = [] EXTRA_APPS = [] +TEST_RUNNER = 'ishtar_common.tests.ManagedModelTestRunner' + try: from local_settings import * except ImportError, e: |