From d92b64aa275841b0c9aea3903aba72fbc4275d91 Mon Sep 17 00:00:00 2001
From: David Lord <davidism@gmail.com>
Date: Mon, 10 Feb 2020 16:36:40 -0800
Subject: [PATCH] clean up merge

---
 CHANGES.rst | 6 ++----
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4bab74f0..502fa504 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -231,11 +231,9 @@ Released 2018-04-26
 Version 0.12.5
 --------------
 
-Released on February 10 2020
+Released 2020-02-10
 
--   Pin Werkzeug to < 1.0.0.  (`#3497`_)
-
-.. _#3497: https://github.com/pallets/flask/issues/3497
+-   Pin Werkzeug to < 1.0.0. :issue:`3497`
 
 
 Version 0.12.4
diff --git a/setup.py b/setup.py
index 20ada368..539f0847 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ setup(
     include_package_data=True,
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
     install_requires=[
-        'Werkzeug>=0.7,<1.0',
+        'Werkzeug>=0.14',
         'Jinja2>=2.4',
         'itsdangerous>=0.21',
         'click>=2.0',