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
..
components	Merge remote-tracking branch 'upstream/main' into develop	2022-11-06 20:59:47 +01:00
containers	Fix reply button on media modal not giving focus to compose form (#17626)	2022-02-25 00:51:01 +01:00
util	Add closed registrations modal (#19437)	2022-10-26 19:35:55 +02:00
index.js	Show about tab if explore tab wouldn't show any statuses	2022-11-06 01:41:55 +01:00