Merge branch 'kb_development' into kb_migration

2023-04-25 10:32:16 +09:00 · 2023-04-25 10:32:16 +09:00 · 9b032185b8
commit 9b032185b8
parent e03f10b1fc 8ddb9a0317
59 changed files with 1441 additions and 28 deletions
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@ -20,6 +20,7 @@ import {
  EmbedModal,
  ListEditor,
  ListAdder,
+  AntennaAdder,
  CompareHistoryModal,
  FilterModal,
  InteractionModal,
@ -43,6 +44,7 @@ const MODAL_COMPONENTS = {
  'LIST_EDITOR': ListEditor,
  'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }),
  'LIST_ADDER': ListAdder,
+  'ANTENNA_ADDER': AntennaAdder,
  'COMPARE_HISTORY': CompareHistoryModal,
  'FILTER': FilterModal,
  'SUBSCRIBED_LANGUAGES': SubscribedLanguagesModal,