From: Michael <heluecht@pirati.ca>
Date: Sun, 3 Dec 2023 14:41:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/2023.09-rc' into channel-settings
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83867687086f3e388f79b1334361697e2cdbe4d1;p=friendica.git

Merge remote-tracking branch 'upstream/2023.09-rc' into channel-settings
---

83867687086f3e388f79b1334361697e2cdbe4d1
diff --cc static/defaults.config.php
index f65e6c9dbd,841a9c2c30..210bcbef64
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@@ -140,10 -144,10 +140,6 @@@ return 
  		// Deny public access to the local user directory.
  		'block_local_dir' => false,
  
- 		// community_no_sharer (Boolean)
- 		// Don't display sharing accounts on the global community
- 		'community_no_sharer' => false,
 -		// blocked_tags (String)
 -		// Comma separated list of hashtags that shouldn't be displayed in the trending tags
 -		'blocked_tags' => '',
--
  		// contact_update_limit (Integer)
  		// How many contacts should be checked at a time?
  		'contact_update_limit' => 100,