Jeremy Kescher 48373a71e3 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2023-01-05 23:29:53 +01:00
..
appearance	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
notifications	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
other	Add “Glitch-only” label to glitch-specific settings	2022-11-12 11:30:35 +01:00