From be46acb87190ad9b59281d4f73e5b1940c79c236 Mon Sep 17 00:00:00 2001
From: David Lord <davidism@gmail.com>
Date: Wed, 18 Apr 2018 13:21:16 -0700
Subject: [PATCH] add changelog for docs theme and tutorial

---
 CHANGES.rst       | 7 +++++++
 flask/__init__.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 11a5da81..4224a269 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -153,6 +153,11 @@ unreleased
 - Added :data:`MAX_COOKIE_SIZE` and :attr:`Response.max_cookie_size` to
   control when Werkzeug warns about large cookies that browsers may
   ignore. (`#2693`_)
+- Updated documentation theme to make docs look better in small
+  windows. (`#2709`_)
+- Rewrote the tutorial docs and example project to take a more
+  structured approach to help new users avoid common pitfalls.
+  (`#2676`_)
 
 .. _pallets/meta#24: https://github.com/pallets/meta/issues/24
 .. _#1421: https://github.com/pallets/flask/issues/1421
@@ -198,8 +203,10 @@ unreleased
 .. _#2635: https://github.com/pallets/flask/pull/2635
 .. _#2629: https://github.com/pallets/flask/pull/2629
 .. _#2651: https://github.com/pallets/flask/issues/2651
+.. _#2676: https://github.com/pallets/flask/pull/2676
 .. _#2691: https://github.com/pallets/flask/pull/2691
 .. _#2693: https://github.com/pallets/flask/pull/2693
+.. _#2709: https://github.com/pallets/flask/pull/2709
 
 
 Version 0.12.2
diff --git a/flask/__init__.py b/flask/__init__.py
index 08fb1dad..9414ecee 100644
--- a/flask/__init__.py
+++ b/flask/__init__.py
@@ -10,7 +10,7 @@
     :license: BSD, see LICENSE for more details.
 """
 
-__version__ = '0.13-dev'
+__version__ = '1.0-dev'
 
 # utilities we import from Werkzeug and Jinja2 that are unused
 # in the module but are exported as public interface.