mirror of https://github.com/tootsuite/mastodon
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 | ||