mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-06 15:03:00 -05:00
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.