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

diff --cc view/lang/C/messages.po
index a8a90b7cdee9a5b4974c83cdb1963d830a5526b6,ee247a288ef7601ad5e16913ff82b320828c66f2..8445834a1b091fb8ce887fc02027f96b0edbf690
--- 1/view/lang/C/messages.po
--- 2/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 ""