Merge branch 'master' into misc

2019-07-23 15:20:05 +02:00
parent 250312152a a7097566c4
commit a9944c762a
14 changed files with 247 additions and 238 deletions
--- a/package.json
+++ b/package.json
@ -31,9 +31,11 @@
    "mocha": "~3.2.0",
    "request": "~2.81.0",
    "serve-static": "^1.12.1",
+    "jsonwebtoken": "^8.3.0",
+    "xtend": "~2.1.2",
    "server-destroy": "~1.0.1",
    "should": "~11.2.1",
    "socket.io": "^1.7.3",
    "socket.io-client": "^1.7.3"
  }
-}
+}