Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
admin
keys
trends
v1
account_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
announcement_serializer.rb
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
domain_block_serializer.rb
encrypted_message_serializer.rb
extended_description_serializer.rb
familiar_followers_serializer.rb
featured_tag_serializer.rb
filter_keyword_serializer.rb
filter_result_serializer.rb
filter_serializer.rb
filter_status_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	Add reading:autoplay:gifs to /api/v1/preferences (#22706)	2023-01-05 13:31:05 +01:00
preview_card_serializer.rb
privacy_policy_serializer.rb
reaction_serializer.rb
relationship_serializer.rb
report_serializer.rb
role_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
translation_serializer.rb
web_push_subscription_serializer.rb