Conflicts: - `app/controllers/follower_accounts_controller.rb`: Upstream refactored a part of the code where glitch-soc has changed the code to potentially hide followers count. Adapt upstream's changes.
Import
Web::PushNotificationWorker
Account#unavailable?
Account#permanently_unavailable?
Style/OptionalBooleanParameter
reorder(nil)
quoted_update
Style/GuardClause
rubocop
OpenSSL::SSL::SSLError
UnfilterNotificationsWorker