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 9e224add8a Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. - `app/views/admin/settings/registrations/show.html.haml`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. Additional changes: - `Gemfile`: Upstream added hcaptcha dependency in another place in the file. - `config/settings.yml`: Upstream added the `captcha_enabled` setting in another place in the file.		1 year ago
..
contrast	Fix wrong colors in the high-contrast theme (#19708)	2 years ago
fonts	Fix SCSS linting issues (#2207)	2 years ago
mastodon	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream	1 year ago
mastodon-light	Change "direct message" nomenclature to "private mention" in web UI (#24248)	2 years ago
application.scss	Add support for incoming rich text (#23913)	2 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Fix SCSS linting issues (#2207)	2 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Update win95 style from cybre.space	3 years ago