Merge branch 'develop' into dependabot/npm_and_yarn/eslint-5.11.1

This commit is contained in:
Aya Morisawa 2018-12-29 19:09:42 +09:00 committed by GitHub
commit 2e8ea34413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 513 additions and 355 deletions

View file

@ -1,8 +1,8 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"version": "10.69.0",
"clientVersion": "2.0.13006",
"version": "10.70.0",
"clientVersion": "2.0.13176",
"codename": "nighthike",
"main": "./built/index.js",
"private": true,
@ -112,7 +112,7 @@
"emojilib": "2.4.0",
"escape-regexp": "0.0.1",
"eslint": "5.11.1",
"eslint-plugin-vue": "4.7.1",
"eslint-plugin-vue": "5.0.0",
"eventemitter3": "3.1.0",
"feed": "2.0.2",
"file-loader": "2.0.0",
@ -155,7 +155,7 @@
"koa-slow": "2.1.0",
"koa-views": "6.1.4",
"langmap": "0.0.16",
"loader-utils": "1.1.0",
"loader-utils": "1.2.3",
"minio": "7.0.2",
"mkdirp": "0.5.1",
"mocha": "5.2.0",