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 1ddb91d539 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		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 'master' into glitch-soc/merge-upstream	4 years ago
mastodon-light	Fix styles for RTL languages and the light theme (#15356)	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)	7 years ago
mailer.scss	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	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