From a9b2fe15e37c209a095af8c269df774b26e0772e Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Wed, 2 Oct 2019 02:25:30 -0400
Subject: [PATCH] Mark 2.1.5 (#1126)

2.1.5 / 2019-10-2
=================

**General**
* Fixes `flask run` debug server by not monkey patching in `wsgi.py`
* Fix CSV exports in Python 3 by converting StringIO to BytesIO
* Avoid exception on sessions without a valid user and force logout
* Fix several issues in Vagrant provisioning

**API**
* Prevent users from nulling out profile values and breaking certain pages
---
 CHANGELOG.md     | 13 +++++++++++++
 CTFd/__init__.py |  2 +-
 docs/conf.py     |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec3c5749..68fae2f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+2.1.5 / 2019-10-2
+=================
+
+**General**
+* Fixes `flask run` debug server by not monkey patching in `wsgi.py`
+* Fix CSV exports in Python 3 by converting StringIO to BytesIO
+* Avoid exception on sessions without a valid user and force logout
+* Fix several issues in Vagrant provisioning
+
+**API**
+* Prevent users from nulling out profile values and breaking certain pages
+
+
 2.1.4 / 2019-08-31
 ==================
 
diff --git a/CTFd/__init__.py b/CTFd/__init__.py
index e7761412..00cdb61c 100644
--- a/CTFd/__init__.py
+++ b/CTFd/__init__.py
@@ -28,7 +28,7 @@ if sys.version_info[0] < 3:
     reload(sys)  # noqa: F821
     sys.setdefaultencoding("utf-8")
 
-__version__ = "2.1.4"
+__version__ = "2.1.5"
 
 
 class CTFdRequest(Request):
diff --git a/docs/conf.py b/docs/conf.py
index ff675886..ce5080cb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@ author = u'Kevin Chung'
 # The short X.Y version
 version = u''
 # The full version, including alpha/beta/rc tags
-release = u'2.1.4'
+release = u'2.1.5'
 
 
 # -- General configuration ---------------------------------------------------