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	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	Merge remote-tracking branch 'upstream/main' into develop	2022-11-12 14:38:59 +01:00