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
..
components	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
containers	Enable ESLint import recommended rules (#23315)	2023-02-13 15:12:31 +01:00
index.jsx	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00