Claire ad9329502a 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.		2022-05-01 16:52:27 +02:00
..
authorizations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
authorized_applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
tokens_controller.rb	Fix error when trying to revoke OAuth token without supplying a token (#18205)	2022-05-01 00:51:32 +02:00