From 6c8adaf0f7492a2bc0f4de34d70b2052be55b7a0 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 12 Nov 2015 16:54:11 +0000 Subject: [PATCH] Prepare for 1.2 release Conflicts: CHANGELOG.txt wagtail/wagtailcore/__init__.py --- CHANGELOG.txt | 2 +- docs/releases/1.2.rst | 6 +++--- wagtail/project_template/requirements.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 78c8dca36a..28e889ec14 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,7 +5,7 @@ Changelog ~~~~~~~~~~~~~~~~ -1.2 (xx.xx.xxxx) +1.2 (12.11.2015) ~~~~~~~~~~~~~~~~ * Added `wagtail.contrib.settings`, a module to allow administrators to edit site-specific settings diff --git a/docs/releases/1.2.rst b/docs/releases/1.2.rst index 50ec9f6b1c..a6b24d38ad 100644 --- a/docs/releases/1.2.rst +++ b/docs/releases/1.2.rst @@ -1,6 +1,6 @@ -========================================== -Wagtail 1.2 release notes - IN DEVELOPMENT -========================================== +========================= +Wagtail 1.2 release notes +========================= .. contents:: :local: diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index a057e8e669..3e21b7cd1e 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,2 +1,2 @@ Django>=1.8,<1.9 -wagtail==1.2rc1 +wagtail==1.2