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 upload progress not communicating processing phase in web UI (#19530)	2022-10-29 20:05:53 +02:00
util	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)	2021-03-02 12:02:56 +01:00
index.js	Fix redirecting to /publish when compose form is visible in web UI (#19427)	2022-10-23 23:37:58 +02:00