diff options
| author | Dan McGee <dan@archlinux.org> | 2014-09-11 18:29:30 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2014-09-11 18:29:30 -0500 |
| commit | 0bc64e77d405844c7f29170859f14c907f9cb340 (patch) | |
| tree | c05b277fe845c09a7786d5300c459f1ab0fe608f /settings.py | |
| parent | a8ceba34299cca271ddf433bf7618aa98e56cc36 (diff) | |
| parent | 1173be8b91910ebc82b9b7e5c8e0aaa5af811daf (diff) | |
Merge branch 'django-1.7'
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/settings.py b/settings.py index 559a55a0..368dcb73 100644 --- a/settings.py +++ b/settings.py @@ -102,6 +102,9 @@ SESSION_COOKIE_HTTPONLY = True # Clickjacking protection X_FRAME_OPTIONS = 'DENY' +# Use new test runner +TEST_RUNNER = 'django.test.runner.DiscoverRunner' + INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', @@ -111,7 +114,6 @@ INSTALLED_APPS = ( 'django.contrib.sitemaps', 'django.contrib.admin', 'django.contrib.staticfiles', - 'south', 'django_countries', 'main', |