Merge tag 'v3.0.1' into instance_only_statuses
This commit is contained in:
@ -33,6 +33,10 @@ defaults: &defaults
|
||||
theme: 'default'
|
||||
aggregate_reblogs: true
|
||||
advanced_layout: false
|
||||
use_blurhash: true
|
||||
use_pending_items: false
|
||||
trends: true
|
||||
trendable_by_default: false
|
||||
notification_emails:
|
||||
follow: false
|
||||
reblog: false
|
||||
@ -42,6 +46,7 @@ defaults: &defaults
|
||||
digest: true
|
||||
report: true
|
||||
pending_account: true
|
||||
trending_tag: true
|
||||
interactions:
|
||||
must_be_follower: false
|
||||
must_be_following: false
|
||||
@ -60,6 +65,9 @@ defaults: &defaults
|
||||
activity_api_enabled: true
|
||||
peers_api_enabled: true
|
||||
show_known_fediverse_at_about_page: true
|
||||
spam_check_enabled: true
|
||||
show_domain_blocks: 'disabled'
|
||||
show_domain_blocks_rationale: 'disabled'
|
||||
|
||||
development:
|
||||
<<: *defaults
|
||||
|
||||
Reference in New Issue
Block a user