diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:52:06 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:52:06 -0400 |
| commit | dceadbebbe0b196278573ed294be8c631d45ecef (patch) | |
| tree | 5274fc4e0397a705dcf1d488074bea9503b3f2c7 /settings.py | |
| parent | 724f8c309c97aa9af7f963687342e8f37e682204 (diff) | |
| parent | 355087ebe2e3fbd5f860e4655888a89d9df52e34 (diff) | |
Merge branch 'master-nomake'
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 a6be4610..b511d613 100644 --- a/settings.py +++ b/settings.py @@ -103,6 +103,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', @@ -112,7 +115,6 @@ INSTALLED_APPS = ( 'django.contrib.sitemaps', 'django.contrib.admin', 'django.contrib.staticfiles', - 'south', 'django_countries', 'main', |