You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		2 years ago
..
contrast	Fix wrong colors in the high-contrast theme (#19708)	2 years ago
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mastodon-light	Increase contrast of upload progress background (#23836)	2 years ago
application.scss	Change public accounts pages to mount the web UI (#19319)	2 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	3 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Update win95 style from cybre.space	3 years ago