Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +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_serializer.rb	…
suggestion_serializer.rb	…
tag_serializer.rb	…
web_push_subscription_serializer.rb	…