merge: upstream

2024-02-03 20:19:44 +01:00
parent f93a8e2d38 66714d94fc
commit 11628e4b6a
285 changed files with 3413 additions and 1913 deletions
@@ -50,7 +50,7 @@ import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
-import { useRouter } from '@/global/router/supplier.js';
+import { useRouter } from '@/router/supplier.js';

 const router = useRouter();