Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire 2022-10-28 11:36:25 +02:00
commit cb19be67d1
567 changed files with 14361 additions and 20828 deletions

View file

@ -73,7 +73,6 @@ defaults: &defaults
bootstrap_timeline_accounts: ''
activity_api_enabled: true
peers_api_enabled: true
show_known_fediverse_at_about_page: true
show_reblogs_in_public_timelines: false
show_replies_in_public_timelines: false
default_content_type: 'text/plain'