From: Michael <heluecht@pirati.ca>
Date: Wed, 4 Oct 2023 09:40:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into user-defined-channels
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b8208974a4026c56dd2573f41a6d377244cca5a8;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into user-defined-channels
---

b8208974a4026c56dd2573f41a6d377244cca5a8
diff --cc view/lang/C/messages.po
index a8a90b7cde,ee247a288e..8445834a1b
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -794,10 -793,9 +794,10 @@@ msgstr "
  msgid "All contacts"
  msgstr ""
  
- #: src/BaseModule.php:433 src/Content/Conversation/Factory/Timeline.php:84
+ #: src/BaseModule.php:435 src/Content/Conversation/Factory/Timeline.php:62
  #: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:415
  #: src/Module/PermissionTooltip.php:127 src/Module/PermissionTooltip.php:149
 +#: src/Module/Settings/Channels.php:120
  msgid "Followers"
  msgstr ""