Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.

2022-02-09 17:28:33 +01:00

..

admin

…

keys

…

trends

…

account_serializer.rb

…

announcement_serializer.rb

…

application_serializer.rb

…

context_serializer.rb

…

conversation_serializer.rb

…

credential_account_serializer.rb

…

custom_emoji_serializer.rb

…

encrypted_message_serializer.rb

…

featured_tag_serializer.rb

…

filter_serializer.rb

…

instance_serializer.rb

…

list_serializer.rb

…

marker_serializer.rb

…

media_attachment_serializer.rb

…

mute_serializer.rb

…

muted_account_serializer.rb

…

notification_serializer.rb

…

poll_serializer.rb

…

preferences_serializer.rb

…

preview_card_serializer.rb

…

reaction_serializer.rb

…

relationship_serializer.rb

…

report_serializer.rb

…

rule_serializer.rb

…

scheduled_status_serializer.rb

…

search_serializer.rb

…

status_edit_serializer.rb

…

status_serializer.rb

…

status_source_serializer.rb

…

suggestion_serializer.rb

…

tag_serializer.rb

…

web_push_subscription_serializer.rb

…