Jeremy Kescher 122870cb6b Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb		2022-11-14 22:18:48 +01:00
..
components	Merge remote-tracking branch 'upstream/main' into develop	2022-11-14 22:18:48 +01:00
containers	Add the ability to edit media attachment metadata for any unattached media (#20402)	2022-11-11 21:22:17 +01: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