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
..
action_bar.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
card.jsx	[Glitch] Add lang attribute to preview card	2023-02-25 14:43:57 +01:00
detailed_status.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00