Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2019-03-28 16:59:04 +00:00
45 changed files with 95 additions and 89 deletions

View File

@@ -32,7 +32,7 @@
"passport-oauth2-client-password": "0.1.2",
"passport": "0.4.0",
"when": "3.7.8",
"ws": "6.2.0"
"ws": "6.2.1"
},
"optionalDependencies": {
"bcrypt": "3.0.5"