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	[Glitch] Fix upload progress not communicating processing phase in web UI	2022-10-30 18:30:58 +01:00
util	Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/compose/util/	2022-10-11 12:15:08 +02:00
index.js	[Glitch] Fix redirecting to /publish when compose form is visible in web UI	2022-10-28 19:26:28 +02:00