mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-12 16:36:23 +00:00
cd99255698
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both. |
||
---|---|---|
.. | ||
authorizations_controller.rb | ||
authorized_applications_controller.rb | ||
tokens_controller.rb |