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	Move flavours/glitch/util/initial_state to flavours/glitch/initial_state	2022-10-11 10:17:04 +02:00
util	[Glitch] Add closed registrations modal	2022-10-28 19:24:02 +02:00
index.js	Remove misc duplicate declarations	2022-11-06 01:42:40 +01:00