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 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		4 years ago
..
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	4 years ago
fonts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
mastodon-light	Fixing the hero widget (#15926)	4 years ago
application.scss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Remove duplicate CSS properties (#16278)	4 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Fix syntax errors in win95 SCSS file	6 years ago