Merge branch 'master' into ho-dockerise

This commit is contained in:
Henry Oswald
2018-03-02 18:11:45 +00:00
3 changed files with 6 additions and 2 deletions

View File

@@ -24,7 +24,6 @@
"compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests",
"nodemon": "nodemon --config nodemon.json"
},
"author": "James Allen <james@sharelatex.com>",
"dependencies": {
"async": "0.2.9",
"body-parser": "^1.2.0",