tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `config/settings.yml`:
  Upstream replaced a setting with 4 new ones, while glitch-soc had modified
  the default value of that setting.
  Removed the old setting and added the new settings, but with defaults
  matching glitch-soc's previous behavior.
This commit is contained in:
Claire
2025-10-06 19:24:16 +02:00
parent d5097398fe 4dc21d7afd
commit 73a625c284
105 changed files with 692 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/settings.yml
+4 -1
View File
@@ -12,7 +12,10 @@ defaults: &defaults
registrations_mode: 'none'
profile_directory: true
closed_registrations_message: ''
timeline_preview: false
local_live_feed_access: 'authenticated'
remote_live_feed_access: 'authenticated'
local_topic_feed_access: 'authenticated'
remote_topic_feed_access: 'authenticated'
show_staff_badge: true
preview_sensitive_media: false
noindex: false