Skip to content

Commit 01959e7

Browse files
committed
Merge branch 'master' into develop
# Conflicts: # .github/CHANGELOG.md
2 parents e0ab41b + 9f397c7 commit 01959e7

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased]
8+
## [2.3.0](https://github.com/hackmcgill/hackerapi/tree/2.3.0) - 2020-01-14
99

1010
### Added
1111

12-
- Added travel model
13-
- Added route to create travel
14-
- Added routes to look up travel by id, email or self
15-
- Added routes to status or offer of an existing travel
12+
- Added travel model
13+
- Added route to create travel
14+
- Added routes to look up travel by id, email or self
15+
- Added routes to status or offer of an existing travel
1616

1717
### Changed
1818

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0
1+
2.3.0

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hackerAPI",
3-
"version": "2.2.0",
3+
"version": "2.3.0",
44
"private": true,
55
"scripts": {
66
"start": "DEBUG=hackboard:* NODE_ENV=development nodemon --ignore gcp_creds.json ./bin/www.js",

0 commit comments

Comments
 (0)