Jeremy Kescher 0d829dadea Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/features/ui/index.js # app/javascript/mastodon/features/ui/index.js		2023-01-18 22:29:27 +01:00
..
components	Merge remote-tracking branch 'upstream/main' into develop	2023-01-18 22:29:27 +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