Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		2023-02-25 14:00:40 +01:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
containers	Change compose form checkbox to native input with appearance: none (#22949)	2023-02-20 11:32:27 +01:00
util	Enable ESLint no-useless-escape (#23311)	2023-02-13 15:12:14 +01:00
index.jsx	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00