Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.		2023-02-09 12:46:12 +01:00
..
admin
keys
trends
v1
account_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +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	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01:00
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
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