Merge remote-tracking branch 'misskey-dev/develop' into io

2024-02-22 06:50:17 +09:00 · 2024-02-22 06:50:17 +09:00 · 50caa3fd5c
commit 50caa3fd5c
parent e99d2b6323 b36e6b1a77
252 changed files with 4312 additions and 3337 deletions
--- a/packages/frontend/src/components/MkPostFormAttaches.vue
+++ b/packages/frontend/src/components/MkPostFormAttaches.vue
@ -152,11 +152,11 @@ function showFileMenu(file: Misskey.entities.DriveFile, ev: MouseEvent): void {
 		icon: 'ti ti-crop',
 		action: () : void => { crop(file); },
 	}] : [], {
+		type: 'divider',
+	}, {
 		text: i18n.ts.attachCancel,
 		icon: 'ti ti-circle-x',
 		action: () => { detachMedia(file.id); },
-	}, {
-		type: 'divider',
 	}, {
 		text: i18n.ts.deleteFile,
 		icon: 'ti ti-trash',