Jeremy Kescher ddc4022845 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js # app/lib/feed_manager.rb # app/services/batched_remove_status_service.rb # lib/mastodon/feeds_cli.rb		2023-03-15 14:13:29 +01:00
..
components	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +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	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
index.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00