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:
@ -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');
|
||||
}
|
||||
|
Reference in New Issue
Block a user