Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.		2023-02-03 19:23:27 +01:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +01:00
containers	Add lang attribute to image description textarea and poll option field (#23293)	2023-01-29 19:00:19 +01:00
util	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
index.js	Upgrade ESlint to v8 (#23305)	2023-01-30 01:45:35 +01:00