Jeremy Kescher b221a857f7 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml		2022-11-17 23:38:08 +01:00
..
v1	Merge remote-tracking branch 'upstream/main' into develop	2022-11-17 23:38:08 +01:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
web	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
base_controller.rb	Add 'private' to Cache-Control, match Rails expectations (#20608)	2022-11-16 04:56:30 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00