Jeremy Kescher 499eecf5a0 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml		2022-10-03 17:39:52 +02:00
..
v1	Merge remote-tracking branch 'upstream/main' into develop	2022-10-03 17:39:52 +02:00
v2	Revert "Change search API to be accessible without being logged in (#18963)"	2022-10-02 18:46:28 +02:00
web	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
base_controller.rb	Fix REST API sometimes returning HTML on error (#19135)	2022-09-08 09:44:36 +02:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00