From dc492c97afb1c23e1ffb63d1d1e1f601f61c2a8a Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Sat, 4 Jan 2020 01:20:50 -0500
Subject: [PATCH] Mark 2.2.1 (#1208)

2.2.1 / 2020-01-04
==================

**General**
* Fix issue preventing admins from creating users or teams
* Fix issue importing backups that contained empty directories
---
 CHANGELOG.md     | 8 ++++++++
 CTFd/__init__.py | 2 +-
 docs/conf.py     | 2 +-
 package.json     | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 673f5454..1b8b01c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+2.2.1 / 2020-01-04
+==================
+
+**General**
+* Fix issue preventing admins from creating users or teams
+* Fix issue importing backups that contained empty directories
+
+
 2.2.0 / 2019-12-22
 ==================
 
diff --git a/CTFd/__init__.py b/CTFd/__init__.py
index da56f945..56676a48 100644
--- a/CTFd/__init__.py
+++ b/CTFd/__init__.py
@@ -30,7 +30,7 @@ if sys.version_info[0] < 3:
     reload(sys)  # noqa: F821
     sys.setdefaultencoding("utf-8")
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 
 
 class CTFdRequest(Request):
diff --git a/docs/conf.py b/docs/conf.py
index 41c42882..4a7b8f38 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.2.0'
+release = u'2.2.1'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/package.json b/package.json
index 1d97f19a..5e98bcc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ctfd",
-  "version": "2.1.5",
+  "version": "2.2.1",
   "description": "CTFd is a Capture The Flag framework focusing on ease of use and customizability. It comes with everything you need to run a CTF and it's easy to customize with plugins and themes.",
   "main": "index.js",
   "directories": {