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
..
glitch	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
vanilla	Fix building vanilla flavor after JSX change	2023-02-25 14:28:59 +01:00