Jeremy Kescher 03f50f2f00 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # lib/mastodon/version.rb # public/avatars/original/missing.png		2022-11-06 20:59:47 +01:00
..
v1	Merge remote-tracking branch 'upstream/main' into develop	2022-11-06 20:59:47 +01:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
web	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
base_controller.rb	Change AUTHORIZED_FETCH to not block unauthenticated REST API access	2022-11-06 00:39:33 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00