merge: upstream

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

 const props = defineProps<{
 	token?: string;