natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
syuilo 2019-01-27 20:09:03 +09:00
parent a488d6e2d6 78763116c3
commit c69d57a064
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -65,6 +65,7 @@
"@types/ms": "0.7.30", "@types/ms": "0.7.30",
"@types/node": "10.12.18", "@types/node": "10.12.18",
"@types/nodemailer": "4.6.5", "@types/nodemailer": "4.6.5",
"@types/nprogress": "0.0.29",
"@types/oauth": "0.9.1", "@types/oauth": "0.9.1",
"@types/parsimmon": "1.10.0", "@types/parsimmon": "1.10.0",
"@types/portscanner": "2.1.0", "@types/portscanner": "2.1.0",

2
src/client/app/common/scripts/loading.ts
View File

@ -1,4 +1,4 @@
const NProgress = require('nprogress'); import * as NProgress from 'nprogress';
NProgress.configure({ NProgress.configure({
trickleSpeed: 500, trickleSpeed: 500,
showSpinner: false showSpinner: false