Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Our config file is pretty different from upstream. Upstream changed CSP directive `script-src` to include `wasm-unsafe-eval` instead of `unsafe-eval`, which we did not include. Added `wasm-unsafe-eval` to `script-src` to fix execution of the OCR web worker. - `package.json`: Upstream updated a dependency (`array-includes`) textually adjacent to a glitch-soc-only dependency (`atrament`). Updated `array-includes` as upstream did.		2022-11-16 08:30:00 +01:00
..
authorizations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-16 08:30:00 +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