Merge branch 'master' of github.com:syuilo/misskey

This commit is contained in:
ha-dai 2017-12-07 17:23:12 +09:00
commit c512c07630

View file

@ -73,7 +73,7 @@
"accesses": "2.5.0",
"animejs": "2.2.0",
"autwh": "0.0.1",
"awesome-typescript-loader": "3.4.0",
"awesome-typescript-loader": "3.4.1",
"bcryptjs": "2.4.3",
"body-parser": "1.18.2",
"cafy": "3.2.0",
@ -94,7 +94,7 @@
"event-stream": "3.3.4",
"eventemitter3": "3.0.0",
"express": "4.16.2",
"file-type": "7.3.0",
"file-type": "7.4.0",
"fuckadblock": "3.2.1",
"gm": "1.23.0",
"gulp": "3.9.1",
@ -109,7 +109,7 @@
"gulp-typescript": "3.2.3",
"gulp-uglify": "3.0.0",
"gulp-util": "3.0.8",
"inquirer": "4.0.0",
"inquirer": "4.0.1",
"is-root": "1.0.0",
"is-url": "1.2.2",
"js-yaml": "3.10.0",
@ -119,7 +119,7 @@
"mongodb": "2.2.33",
"monk": "6.0.5",
"morgan": "1.9.0",
"ms": "2.0.0",
"ms": "2.1.1",
"multer": "1.3.0",
"nprogress": "0.2.0",
"os-utils": "0.0.14",
@ -155,11 +155,11 @@
"tslint": "5.8.0",
"typescript": "2.6.2",
"uglify-es": "3.2.0",
"uglifyjs-webpack-plugin": "1.1.1",
"uglifyjs-webpack-plugin": "1.1.2",
"uuid": "3.1.0",
"vhost": "3.0.2",
"web-push": "3.2.4",
"webpack": "3.8.1",
"web-push": "3.2.5",
"webpack": "3.10.0",
"websocket": "1.0.25",
"xev": "2.0.0"
}