From 186280628356db70ec8709f250e7d099b651fdb8 Mon Sep 17 00:00:00 2001
From: Medhat Assaad <massaad@users.noreply.github.com>
Date: Thu, 20 Apr 2017 04:50:51 -0500
Subject: [PATCH] update django requirement in setup.py to allow django 1.11
 (#3555)

* update django requirement in setup.py to allow django 1.11

* update the django requirement in the project template to allow django 1.11
---
 setup.py                                  | 2 +-
 wagtail/project_template/requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 86c1214204..fa704e0221 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ except ImportError:
 
 
 install_requires = [
-    "Django>=1.8.1,<1.11",
+    "Django>=1.8.1,<1.12",
     "django-modelcluster>=3.1,<4.0",
     "django-taggit>=0.20,<1.0",
     "django-treebeard>=3.0,<5.0",
diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt
index c253c9ac37..2ff9f2c12f 100644
--- a/wagtail/project_template/requirements.txt
+++ b/wagtail/project_template/requirements.txt
@@ -1,2 +1,2 @@
-Django>=1.10,<1.11
+Django>=1.10,<1.12
 wagtail==1.10rc1