Merge remote-tracking branch 'misskey-dev/develop' into io
This commit is contained in:
		| @@ -22,7 +22,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id.js'; | ||||
| import { deckStore } from '@/ui/deck/deck-store.js'; | ||||
| import { miLocalStorage } from '@/local-storage.js'; | ||||
| import { fetchCustomEmojis } from '@/custom-emojis.js'; | ||||
| import { setupRouter } from '@/global/router/definition.js'; | ||||
| import { setupRouter } from '@/router/definition.js'; | ||||
|  | ||||
| export async function common(createVue: () => App<Element>) { | ||||
| 	console.info(`Misskey v${version}`); | ||||
|   | ||||
| @@ -19,7 +19,7 @@ import { claimAchievement, claimedAchievements } from '@/scripts/achievements.js | ||||
| import { initializeSw } from '@/scripts/initialize-sw.js'; | ||||
| import { deckStore } from '@/ui/deck/deck-store.js'; | ||||
| import { emojiPicker } from '@/scripts/emoji-picker.js'; | ||||
| import { mainRouter } from '@/global/router/main.js'; | ||||
| import { mainRouter } from '@/router/main.js'; | ||||
|  | ||||
| export async function mainBoot() { | ||||
| 	const { isClientUpdated } = await common(() => createApp( | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 まっちゃとーにゅ
					まっちゃとーにゅ