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
..
components	rebase with upstream	2022-12-20 18:27:51 +01:00
containers	Don't autofocus the compose form (#16517)	2022-12-15 17:37:05 +01:00
util	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
index.js	Don't autofocus the compose form (#16517)	2022-12-15 17:37:05 +01:00