Merge branch 'master' into develop

loreina · loreina · commit 050ba0fb6177 · 2020-01-14T10:26:13.000-05:00
# Conflicts:
#	.github/CHANGELOG.md
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [2.2.0](https://github.com/hackmcgill/hackerapi/tree/2.2.0) - 2020-01-12
 
 ### Added
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.3
+2.2.0
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hackerAPI",
-    "version": "2.1.3",
+    "version": "2.2.0",
     "private": true,
     "scripts": {
         "start": "DEBUG=hackboard:* NODE_ENV=development nodemon --ignore gcp_creds.json ./bin/www.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hackerAPI",`
`3`		`- "version": "2.1.3",`
	`3`	`+ "version": "2.2.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "DEBUG=hackboard:* NODE_ENV=development nodemon --ignore gcp_creds.json ./bin/www.js",`