upgrade django==1.4.22, fix admin templates

diff --git a/requirements.txt b/requirements.txt
index ce53bcfb7d76cd4521263c0334f0c41fabd1161f..7b1197d4f9dff3eb5aefa74c82a07231787628b5 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ configparser==4.0.2
 crocodoc==0.1.1
 debtcollector==1.22.0
 decorator==4.0.10
-Django==1.4.19
+Django==1.4.22
 django-bootstrap-pagination==1.5.1
 django-bootstrap3==6.1.0
 django-cacheops==2.1.1

diff --git a/settings.py b/settings.py
index 3d53deeaec8a2f4cc47ae4816e791d6dca6a947d..66821f748f6a137b0cf426b3fade43bc828e2076 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -120,13 +120,13 @@ ROOT_URLCONF = 'urls'
 #)
 
 INSTALLED_APPS = (
+    'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django.contrib.admin',
     'teleforma',
     'telemeta',
     'jsonrpc',