usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
syuilo 2017-09-08 20:49:58 +09:00
parent e1aea70154 12745f3c79
commit 99db09b702
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -24,7 +24,7 @@
"@types/bcryptjs": "2.4.0", "@types/bcryptjs": "2.4.0",
"@types/body-parser": "1.16.5", "@types/body-parser": "1.16.5",
"@types/chai": "4.0.4", "@types/chai": "4.0.4",
"@types/chai-http": "3.0.2", "@types/chai-http": "3.0.3",
"@types/chalk": "0.4.31", "@types/chalk": "0.4.31",
"@types/compression": "0.0.34", "@types/compression": "0.0.34",
"@types/cors": "2.8.1", "@types/cors": "2.8.1",
@ -53,14 +53,14 @@
"@types/morgan": "1.7.32", "@types/morgan": "1.7.32",
"@types/ms": "0.7.30", "@types/ms": "0.7.30",
"@types/multer": "1.3.2", "@types/multer": "1.3.2",
"@types/node": "8.0.26", "@types/node": "8.0.27",
"@types/ratelimiter": "2.1.28", "@types/ratelimiter": "2.1.28",
"@types/redis": "2.6.0", "@types/redis": "2.6.0",
"@types/request": "2.0.3", "@types/request": "2.0.3",
"@types/rimraf": "2.0.0", "@types/rimraf": "2.0.0",
"@types/riot": "3.6.0", "@types/riot": "3.6.0",
"@types/serve-favicon": "2.2.28", "@types/serve-favicon": "2.2.28",
"@types/uuid": "3.4.1", "@types/uuid": "3.4.2",
"@types/webpack": "3.0.10", "@types/webpack": "3.0.10",
"@types/webpack-stream": "3.2.7", "@types/webpack-stream": "3.2.7",
"@types/websocket": "0.0.34", "@types/websocket": "0.0.34",
@ -91,7 +91,7 @@
"uglify-es": "3.0.27", "uglify-es": "3.0.27",
"uglify-es-webpack-plugin": "0.10.0", "uglify-es-webpack-plugin": "0.10.0",
"uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony", "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
"webpack": "3.5.5" "webpack": "3.5.6"
}, },
"dependencies": { "dependencies": {
"accesses": "2.5.0", "accesses": "2.5.0",
@ -132,7 +132,7 @@
"page": "1.7.1", "page": "1.7.1",
"pictograph": "2.0.4", "pictograph": "2.0.4",
"prominence": "0.2.0", "prominence": "0.2.0",
"pug": "2.0.0-rc.3", "pug": "2.0.0-rc.4",
"ratelimiter": "3.0.3", "ratelimiter": "3.0.3",
"recaptcha-promise": "0.1.3", "recaptcha-promise": "0.1.3",
"reconnecting-websocket": "3.2.1", "reconnecting-websocket": "3.2.1",