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
..
contrast
fonts
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
mastodon-light	Increase contrast of upload progress background (#23836)	2023-02-23 12:58:42 +01:00
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss