summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-24 07:03:49 +0900
committerGitHub <noreply@github.com>2018-08-24 07:03:49 +0900
commit87f248b8ec2fea3fe2eef733518a3ecaa5e7f184 (patch)
tree0753f31e5bc64c624e03c3a72b7b7b201fdfcf21 /package.json
parentMerge pull request #2439 from syuilo/develop (diff)
parent8.3.1 (diff)
downloadmisskey-87f248b8ec2fea3fe2eef733518a3ecaa5e7f184.tar.gz
misskey-87f248b8ec2fea3fe2eef733518a3ecaa5e7f184.tar.bz2
misskey-87f248b8ec2fea3fe2eef733518a3ecaa5e7f184.zip
Merge pull request #2440 from syuilo/develop
8.3.1
Diffstat (limited to 'package.json')
-rw-r--r--package.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json
index 99a672e636..d3bfc27cfe 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
- "version": "8.3.0",
- "clientVersion": "1.0.8825",
+ "version": "8.3.1",
+ "clientVersion": "1.0.8828",
"codename": "nighthike",
"main": "./built/index.js",
"private": true,
@@ -150,6 +150,7 @@
"loader-utils": "1.1.0",
"lodash.assign": "4.2.0",
"mecab-async": "0.1.2",
+ "merge-options": "1.0.1",
"minio": "7.0.0",
"mkdirp": "0.5.1",
"mocha": "5.2.0",