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

2019-01-27 20:09:03 +09:00
parent a488d6e2d6 78763116c3
commit c69d57a064
2 changed files with 2 additions and 1 deletions
--- a/src/client/app/common/scripts/loading.ts
+++ b/src/client/app/common/scripts/loading.ts
@@ -1,4 +1,4 @@
-const NProgress = require('nprogress');
+import * as NProgress from 'nprogress';
 NProgress.configure({
 	trickleSpeed: 500,
 	showSpinner: false