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	Fix reply button on media modal not giving focus to compose form (#17626)	2022-02-25 00:51:01 +01:00
util	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
index.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00