Merge remote-tracking branch 'parent/main' into upstream-20241126

app/javascript/mastodon/features/ui/components/modal_root.jsx

@@ -10,11 +10,8 @@ import {
   DomainBlockModal,
   ReportModal,
   EmbedModal,
-  ListEditor,
   ListAdder,
-  AntennaEditor,
   AntennaAdder,
-  CircleEditor,
   CircleAdder,
   BookmarkCategoryAdder,
   CompareHistoryModal,
@@ -69,9 +66,6 @@ export const MODAL_COMPONENTS = {
   'REPORT': ReportModal,
   'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
   'EMBED': EmbedModal,
-  'LIST_EDITOR': ListEditor,
-  'ANTENNA_EDITOR': AntennaEditor,
-  'CIRCLE_EDITOR': CircleEditor,
   'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }),
   'LIST_ADDER': ListAdder,
   'ANTENNA_ADDER': AntennaAdder,