Merge branch 'master' into greenkeeper/tslint-5.3.2

package.json

@@ -12,7 +12,6 @@
     "config": "node ./tools/init.js",
     "start": "node ./built",
     "debug": "DEBUG=misskey:* node ./built",
-    "update": "./tools/update.sh",
     "swagger": "node ./swagger.js",
     "build": "gulp build",
     "rebuild": "gulp rebuild",
@@ -35,7 +34,6 @@
     "@types/escape-html": "0.0.19",
     "@types/event-stream": "3.3.31",
     "@types/express": "4.0.35",
-    "@types/glob": "5.0.30",
     "@types/gm": "1.17.30",
     "@types/gulp": "4.0.3",
     "@types/gulp-mocha": "0.0.30",
@@ -76,7 +74,7 @@
     "gulp-pug": "3.3.0",
     "gulp-rename": "1.2.2",
     "gulp-replace": "0.5.4",
-    "gulp-tslint": "8.0.0",
+    "gulp-tslint": "8.1.0",
     "gulp-typescript": "3.1.6",
     "gulp-uglify": "3.0.0",
     "gulp-util": "3.0.8",
@@ -87,6 +85,7 @@
     "stylus-loader": "3.0.1",
     "swagger-jsdoc": "1.9.4",
     "tslint": "5.3.2",
+    "uglify-es": "3.0.11",
     "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
     "webpack": "2.6.0"
   },
@@ -105,14 +104,13 @@
     "debug": "2.6.8",
     "deep-equal": "1.0.1",
     "deepcopy": "0.6.3",
-    "download": "6.1.0",
+    "download": "6.2.0",
     "elasticsearch": "13.0.1",
     "escape-html": "1.0.3",
     "escape-regexp": "0.0.1",
-    "express": "4.15.2",
+    "express": "4.15.3",
     "file-type": "4.3.0",
     "fuckadblock": "3.2.1",
-    "glob": "7.1.1",
     "gm": "1.23.0",
     "inquirer": "3.0.6",
     "is-root": "1.0.0",