7 commits

Author	SHA1	Message	Date
Jeremy Kescher	5be3fb3d66	Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions	2024-01-02 12:16:35 +01:00
gunchleoc	217ef7f2af	Replace 'favourite' by 'favorite' for American English (#26009)	2023-07-21 19:09:13 +02:00
Local User	0527458f38	Merge branch 'upstream/main' into develop	2023-07-07 01:25:26 +02:00
Renaud Chaput	d27216dc46	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
Renaud Chaput	8f66126b10	Use the new JSX transform (#25064)	2023-05-23 10:52:27 +02: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
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/notifications/components/column_settings.js (Browse further)