diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
| commit | ea00a099dffd7157c93af54b5817734348d2bbc6 (patch) | |
| tree | 89fa4ba0c0ac19a4286ba4c4cb64f77536b1a098 /settings.py | |
| parent | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (diff) | |
| parent | 0f0ce18109f8104d7b2abe9024ef26fa07ff0292 (diff) | |
Merge branch 'archweb' into archweb-generic
Conflicts:
templates/public/download.html
templates/public/index.html
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 02a4d497..8ab95421 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', |