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

2025-01-23 18:10:34 +09:00 · 2025-01-23 18:10:34 +09:00 · 50ae2d9439
commit 50ae2d9439
parent 9c14810881 4a9c49ee43
320 changed files with 2587 additions and 2817 deletions
--- a/app/serializers/rest/credential_account_serializer.rb
+++ b/app/serializers/rest/credential_account_serializer.rb
@ -19,6 +19,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
      hide_collections: object.hide_collections,
      discoverable: object.discoverable,
      indexable: object.indexable,
+      attribution_domains: object.attribution_domains,
    }
  end