From fe85fdf1e5561e9f04c1c80c72e894dcd7ea3ad7 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Thu, 9 Jan 2020 20:32:50 -0500
Subject: [PATCH] Mark 2.2.2 (#1212)

2.2.2 / 2020-01-09
==================

**General**
* Add jQuery, Moment, nunjucks, and Howl to window globals to make it easier for plugins to access JS modules
* Fix issue with timezone loading in config page which was preventing display of CTF times
---
 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 1b8b01c..e2044dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+2.2.2 / 2020-01-09
+==================
+
+**General**
+* Add jQuery, Moment, nunjucks, and Howl to window globals to make it easier for plugins to access JS modules
+* Fix issue with timezone loading in config page which was preventing display of CTF times
+
+
 2.2.1 / 2020-01-04
 ==================
 
diff --git a/CTFd/__init__.py b/CTFd/__init__.py
index 56676a4..2766384 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.1"
+__version__ = "2.2.2"
 
 
 class CTFdRequest(Request):
diff --git a/docs/conf.py b/docs/conf.py
index 4a7b8f3..3f8c95c 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.1'
+release = u'2.2.2'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/package.json b/package.json
index 5e98bcc..cb02c4b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ctfd",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "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": {