Merge branch 'master' into greenkeeper/cafy-1.2.0

This commit is contained in:
syuilo⭐️ 2017-03-09 00:45:24 +09:00 committed by GitHub
commit 7af14dd613

View file

@ -30,12 +30,12 @@
"@types/compression": "0.0.33",
"@types/cors": "2.8.0",
"@types/debug": "0.0.29",
"@types/elasticsearch": "5.0.12",
"@types/elasticsearch": "5.0.13",
"@types/escape-html": "0.0.19",
"@types/event-stream": "3.3.30",
"@types/express": "4.0.35",
"@types/glob": "5.0.30",
"@types/gm": "1.17.29",
"@types/gm": "1.17.30",
"@types/gulp": "3.8.32",
"@types/gulp-mocha": "0.0.29",
"@types/gulp-rename": "0.0.31",
@ -55,18 +55,18 @@
"@types/multer": "0.0.33",
"@types/ratelimiter": "2.1.28",
"@types/redis": "0.12.36",
"@types/request": "0.0.40",
"@types/request": "0.0.41",
"@types/rimraf": "0.0.28",
"@types/riot": "2.6.1",
"@types/serve-favicon": "2.2.28",
"@types/uuid": "2.0.29",
"@types/webpack": "2.2.7",
"@types/webpack": "2.2.8",
"@types/webpack-stream": "3.2.6",
"@types/websocket": "0.0.33",
"autwh": "0.0.1",
"bcryptjs": "2.4.3",
"body-parser": "1.17.0",
"cafy": "1.2.0",
"body-parser": "1.17.1",
"chai": "3.5.0",
"chai-http": "3.0.0",
"chalk": "1.1.3",
@ -74,7 +74,7 @@
"cors": "2.8.1",
"cropperjs": "1.0.0-beta.2",
"crypto": "0.0.3",
"css-loader": "0.26.2",
"css-loader": "0.26.4",
"debug": "2.6.1",
"deepcopy": "0.6.3",
"download": "5.0.3",
@ -92,7 +92,7 @@
"gulp": "3.9.1",
"gulp-cssnano": "2.1.2",
"gulp-imagemin": "3.1.1",
"gulp-mocha": "4.0.1",
"gulp-mocha": "4.1.0",
"gulp-pug": "3.2.0",
"gulp-rename": "1.2.2",
"gulp-tslint": "7.1.0",
@ -126,9 +126,9 @@
"rndstr": "1.0.0",
"s-age": "1.1.0",
"serve-favicon": "2.4.1",
"string-replace-webpack-plugin": "0.0.5",
"string-replace-webpack-plugin": "0.1.2",
"stylus": "0.54.5",
"stylus-loader": "2.5.0",
"stylus-loader": "2.5.1",
"subdomain": "1.2.0",
"summaly": "2.0.0",
"swagger-jsdoc": "1.9.2",