4 commits

Author	SHA1	Message	Date
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
Jeremy Kescher	7318b74ebf	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml	2023-03-05 12:34:16 +01:00
Christian Schmidt	cb868228bd	Do not leave Mastodon when clicking “Back” (#23953)	2023-03-04 23:18:19 +01:00
Renaud Chaput	44a7d87cb1	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00

Renamed from app/javascript/mastodon/features/ui/index.js (Browse further)