Jeremy Kescher 0d829dadea Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/features/ui/index.js # app/javascript/mastodon/features/ui/index.js		2023-01-18 22:29:27 +01:00
..
v1	Merge remote-tracking branch 'upstream/main' into develop	2023-01-18 22:29:27 +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	Change CSP directives on API to be tight and concise (#20960)	2022-12-15 16:40:32 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00