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
..
glitch	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
vanilla	Fix building vanilla flavor after JSX change	2023-02-25 14:28:59 +01:00