Conflicts: - `app/models/user_settings.rb`: Not a real conflict, upstream added a setting on a line adjacent to a glitch-soc-only line. Added upstream's new setting.
Web::PushSubscription#user
Web::PushSubscription#access_token
rubocop-rspec
frontend_translations
COVERAGE
likes
shares