merge: upstream

2024-01-09 02:57:57 +01:00
parent 94fee180b9 34088ecd27
commit 7552cea69a
413 changed files with 5517 additions and 2309 deletions
@@ -25,8 +25,8 @@ import MkInput from '@/components/MkInput.vue';
 import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
-import { mainRouter } from '@/router.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { mainRouter } from '@/global/router/main.js';

 const props = defineProps<{
 	token?: string;