Merge remote-tracking branch 'refs/remotes/misskey-dev/master'

Conflicts:
	package.json
	packages/client/src/components/MkButton.vue
	packages/client/src/components/ui/button.vue
	packages/client/src/pages/timeline.tutorial.vue
This commit is contained in:
2022-09-10 21:24:53 +09:00
373 changed files with 3168 additions and 2416 deletions

View File

@ -39,7 +39,7 @@ export default defineComponent({
id: notification.id
});
popup(defineAsyncComponent(() => import('@/components/notification-toast.vue')), {
popup(defineAsyncComponent(() => import('@/components/MkNotificationToast.vue')), {
notification
}, {}, 'closed');
}