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	Move flavours/glitch/util/initial_state to flavours/glitch/initial_state	2022-10-11 10:17:04 +02:00
util	[Glitch] Rename JSX files with proper .jsx extension	2023-02-25 14:35:31 +01:00
index.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00