mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-21 11:47:33 +02: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 |