Merge branch 'master' into greenkeeper/@types/chai-http-3.0.2

package.json

@@ -1,7 +1,7 @@
 {
   "name": "misskey",
   "author": "syuilo <i@syuilo.com>",
-  "version": "0.0.2344",
+  "version": "0.0.2367",
   "license": "MIT",
   "description": "A miniblog-based SNS",
   "bugs": "https://github.com/syuilo/misskey/issues",
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@types/bcryptjs": "2.4.0",
     "@types/body-parser": "1.16.4",
-    "@types/chai": "4.0.2",
+    "@types/chai": "4.0.3",
     "@types/chai-http": "3.0.2",
     "@types/chalk": "0.4.31",
     "@types/compression": "0.0.33",
@@ -91,7 +91,7 @@
     "uglify-es": "3.0.27",
     "uglify-es-webpack-plugin": "0.10.0",
     "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
-    "webpack": "3.5.3"
+    "webpack": "3.5.4"
   },
   "dependencies": {
     "accesses": "2.5.0",
@@ -133,7 +133,7 @@
     "pug": "2.0.0-rc.3",
     "ratelimiter": "3.0.3",
     "recaptcha-promise": "0.1.3",
-    "reconnecting-websocket": "3.0.7",
+    "reconnecting-websocket": "3.1.1",
     "redis": "2.8.0",
     "request": "2.81.0",
     "rimraf": "2.6.1",