mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-14 06:33:49 -05:00
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss