diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-01-18 14:20:38 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-01-18 14:20:38 +0900 |
| commit | 0e9e5327ed7a58df28a26dc0c0fe3fdb25fd56ad (patch) | |
| tree | 973ead4fe60418815fd81eca56cce56ecd93d872 | |
| parent | bye bye bcrypt-nodejs (diff) | |
| parent | Merge pull request #46 from syuilo/greenkeeper/body-parser-1.16.0 (diff) | |
| download | misskey-0e9e5327ed7a58df28a26dc0c0fe3fdb25fd56ad.tar.gz misskey-0e9e5327ed7a58df28a26dc0c0fe3fdb25fd56ad.tar.bz2 misskey-0e9e5327ed7a58df28a26dc0c0fe3fdb25fd56ad.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# package.json
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 10783d8806..13ef4a973e 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@types/chalk": "0.4.31", "@types/compression": "0.0.33", "@types/cors": "2.8.0", - "@types/elasticsearch": "5.0.10", + "@types/elasticsearch": "5.0.12", "@types/escape-html": "0.0.19", "@types/event-stream": "3.3.30", "@types/express": "4.0.34", @@ -67,7 +67,7 @@ "babel-preset-es2015": "6.18.0", "babel-preset-stage-3": "6.17.0", "bcryptjs": "2.4.0", - "body-parser": "1.15.2", + "body-parser": "1.16.0", "browserify": "13.3.0", "browserify-livescript": "0.2.3", "chai": "3.5.0", |