Merge remote-tracking branch 'upstream/master'

Shaun Hare · Shaun Hare · commit 13610046ee2b · 2017-05-11T12:07:03.000+01:00
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ An API for storing users, teams, hacks, challenges and sponsors
 
 ## Running the Server
 
-This API is written in TypeScript with an Express server using Mongoose for data storage in MongoDB.
+This API is written in TypeScript with [hapi.js](https://hapijs.com/) using Mongoose for data storage in MongoDB.
 
 ### Prerequisites
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hack24-api",
   "description": "Hack24 Application",
-  "version": "1.0.0-0",
+  "version": "1.0.1",
   "private": true,
   "engines":{
 	"node":"6.9.5"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hack24-api",`
`3`	`3`	`"description": "Hack24 Application",`
`4`		`- "version": "1.0.0-0",`
	`4`	`+ "version": "1.0.1",`
`5`	`5`	`"private": true,`
`6`	`6`	`"engines":{`
`7`	`7`	`"node":"6.9.5"`