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 e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		3 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	5 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	3 years ago
mastodon-light	Add duration parameter to muting. (#13831)	4 years ago
application.scss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
contrast.scss	Separate high contrast theme (#7213)	6 years ago
mailer.scss	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	3 years ago
mastodon-light.scss	More polished light theme (#7620)	6 years ago
win95.scss	Fix syntax errors in win95 SCSS file	5 years ago