Merge pull request #582 from freedomofpress/30-django-1.11.18

Upgrade to Django 1.11.18
freedomofpress · Jan 7, 2019 · f8e0ecb · f8e0ecb
2 parents 8c7c4d3 + ebbc16c
commit f8e0ecb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -22,7 +22,7 @@ django-settings-export==1.2.1
 django-taggit==0.22.1
 django-treebeard==4.1.2
 django-webpack-loader==0.5.0
-django==1.11.15
+django==1.11.18
 djangorestframework==3.6.4
 docopt==0.6.2
 dominate==2.3.5

diff --git a/requirements.in b/requirements.in
@@ -1,7 +1,7 @@
 -e git+https://github.com/freedomofpress/django-logging.git@b7d0b7b542db6ac088dbf3d2e7b249df333d3082#egg=django-logging-json
 -e git+https://github.com/nabla-c0d3/sslyze.git@ef357c2e76b6ba66f23db5fb1f95c7e8a6c13b9d#egg=pshtt-dependency-hell
 bleach>=2.1.3
-Django>=1.11.15<2
+Django>=1.11.18<2
 django-analytical>=2.4
 django-anymail[mailgun]>=1.4
 django-modelcluster

diff --git a/requirements.txt b/requirements.txt
@@ -20,7 +20,7 @@ django-settings-export==1.2.1
 django-taggit==0.22.1     # via wagtail
 django-treebeard==4.1.2   # via wagtail
 django-webpack-loader==0.5.0
-django==1.11.15
+django==1.11.18
 djangorestframework==3.6.4
 docopt==0.6.2             # via pshtt
 dominate==2.3.5           # via pytablewriter