diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e4cb3e59bb..403bb2d4f1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,7 +4,7 @@ Changelog 1.6 (xx.xx.xxxx) ~~~~~~~~~~~~~~~~ - * Provisional Django 1.10 support + * Django 1.10 support * Added the ``include_block`` template tag for improved StreamField template inclusion (Matt Westcott, Mikalai Radchuk) * Page slugs now allow unicode on Django >= 1.9 (Behzad Nategh) * Explorer sidebar menu now limits the displayed pages to the ones the user has permission for (Robert Rollins, Matt Westcott) diff --git a/docs/releases/1.6.rst b/docs/releases/1.6.rst index f952067498..1b689d3a46 100644 --- a/docs/releases/1.6.rst +++ b/docs/releases/1.6.rst @@ -11,10 +11,10 @@ What's new ========== -Provisional Django 1.10 support -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Django 1.10 support +~~~~~~~~~~~~~~~~~~~ -All compatibility issues as of Django 1.10rc1 have been resolved, and we expect to be able to support Django 1.10 final in this release or a follow-up patch release. Thanks to Mikalai Radchuk and Paul J Stevens for developing this, and to Tim Graham for reviewing and additional Django core assistance. +Wagtail is now compatible with Django 1.10. Thanks to Mikalai Radchuk and Paul J Stevens for developing this, and to Tim Graham for reviewing and additional Django core assistance. ``{% include_block %}`` tag for improved StreamField template inclusion diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index 64dd43fb0a..178a0132bf 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,2 +1,2 @@ -Django>=1.9,<1.10 +Django>=1.10,<1.11 wagtail==1.6rc1