You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/controllers/oauth
Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.js`:
  Conflicts due to glitch-soc's theming system.
  Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
  Minor conflict due to glitch-soc's option to allow CWed toots in trends.
  Ported upstream changes.
2 years ago
..
authorizations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 4 years ago
authorized_applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 4 years ago
tokens_controller.rb Fix error when trying to revoke OAuth token without supplying a token (#18205) 2 years ago