Merge branches 'master' and 'master' of https://github.com/syuilo/misskey

This commit is contained in:
syuilo 2017-12-12 21:31:58 +09:00
commit be21d86307

View file

@ -30,7 +30,7 @@
"@prezzemolo/zip": "0.0.3",
"@types/bcryptjs": "2.4.1",
"@types/body-parser": "1.16.8",
"@types/chai": "4.0.8",
"@types/chai": "4.0.10",
"@types/chai-http": "3.0.3",
"@types/compression": "0.0.35",
"@types/cookie": "0.3.1",
@ -54,18 +54,18 @@
"@types/is-url": "1.2.28",
"@types/js-yaml": "3.10.1",
"@types/mocha": "2.2.44",
"@types/mongodb": "2.2.16",
"@types/mongodb": "2.2.17",
"@types/monk": "1.0.6",
"@types/morgan": "1.7.35",
"@types/ms": "0.7.30",
"@types/multer": "1.3.6",
"@types/node": "8.0.57",
"@types/node": "8.0.58",
"@types/page": "1.5.32",
"@types/proxy-addr": "2.0.0",
"@types/qrcode": "0.8.0",
"@types/ratelimiter": "2.1.28",
"@types/redis": "2.8.2",
"@types/request": "2.0.8",
"@types/request": "2.0.9",
"@types/rimraf": "2.0.2",
"@types/riot": "3.6.1",
"@types/seedrandom": "2.4.27",