Jeremy Kescher 2379efb52f Merge remote-tracking branch 'upstream/main' into reactions ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2022-12-21 23:45:28 +01:00
..
glitch	Merge remote-tracking branch 'upstream/main' into reactions	2022-12-21 23:45:28 +01:00
vanilla	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00