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

2024-10-21 07:07:48 +09:00 · 2024-10-21 07:07:48 +09:00 · ab58aed910
commit ab58aed910
parent beaf165c93 1fc165de02
279 changed files with 2761 additions and 1351 deletions
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@ -91,6 +91,10 @@ const initialState = ImmutableMap({
      'admin.sign_up': true,
      'admin.report': true,
    }),
+
+    group: ImmutableMap({
+      follow: true
+    }),
  }),

  firehose: ImmutableMap({