Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		2022-04-06 21:10:23 +02:00
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-30 13:40:10 +02:00
web	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
base_controller.rb	Fix locale not being set in REST API (#17847)	2022-03-22 12:29:04 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00