Flask patch update

ckan · Dec 4, 2018 · 7b7e5df · 7b7e5df
1 parent 7eaaa1d
commit 7b7e5df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/requirements.in b/requirements.in
@@ -5,7 +5,12 @@ Beaker==1.8.1 # Needs to be pinned to a more up to date version than the Pylons
 bleach==1.5.0
 click==6.7
 fanstatic==0.12
+<<<<<<< HEAD
 Flask==0.11.1
+=======
+Flask==0.12.4
+Flask-Babel==0.11.2
+>>>>>>> 5787c7b1a... Flask patch update
 Jinja2==2.8
 Markdown==2.6.7
 ofs==0.4.2

diff --git a/requirements.txt b/requirements.txt
@@ -11,8 +11,9 @@ bleach==1.5.0
 click==6.7
 decorator==4.0.6          # via pylons, sqlalchemy-migrate
 fanstatic==0.12
-Flask==0.11.1
-FormEncode==1.3.0         # via pylons
+Flask-Babel==0.11.2
+Flask==0.12.4             # via flask-babel
+FormEncode==1.3.1         # via pylons
 funcsigs==1.0.2           # via beaker
 html5lib==0.9999999       # via bleach
 itsdangerous==0.24        # via flask