Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Essem 2023-05-28 10:40:04 -05:00
commit 7cbfc6b4ac
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
344 changed files with 3967 additions and 1611 deletions

View file

@ -44,8 +44,8 @@ defaults: &defaults
show_domain_blocks_rationale: 'disabled'
outgoing_spoilers: ''
require_invite_text: false
captcha_enabled: false
backups_retention_period: 7
captcha_enabled: false
development:
<<: *defaults