Merge branch 'develop' into vue3

This commit is contained in:
syuilo 2020-07-30 10:34:39 +09:00
commit 66f6c8c3fd
101 changed files with 1671 additions and 370 deletions

View file

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <syuilotan@yahoo.co.jp>",
"version": "12.42.0",
"version": "12.45.0",
"codename": "indigo",
"repository": {
"type": "git",
@ -47,7 +47,7 @@
"@koa/multer": "3.0.0",
"@koa/router": "9.0.1",
"@sinonjs/fake-timers": "6.0.1",
"@syuilo/aiscript": "0.8.0",
"@syuilo/aiscript": "0.10.0",
"@types/bcryptjs": "2.4.2",
"@types/bull": "3.14.0",
"@types/cbor": "5.0.0",
@ -204,6 +204,7 @@
"random-seed": "0.3.0",
"randomcolor": "0.5.4",
"ratelimiter": "3.4.1",
"re2": "1.15.4",
"recaptcha-promise": "0.1.3",
"reconnecting-websocket": "4.4.0",
"redis": "3.0.2",