Merge tag '2023.12.0-beta.6' into merge-upstream

2023-12-21 11:56:34 +09:00
parent e24c90968d f88ed4dd1a
commit b3de794bdd
251 changed files with 2328 additions and 1176 deletions
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -103,7 +103,7 @@ import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { customEmojiCategories } from '@/custom-emojis.js';
 import MkSwitch from '@/components/MkSwitch.vue';
-import { selectFile, selectFiles } from '@/scripts/select-file.js';
+import { selectFile } from '@/scripts/select-file.js';
 import MkRolePreview from '@/components/MkRolePreview.vue';

 const props = defineProps<{