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.

Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock		6 years ago
..
contrast	Fix some colors of high contrast theme (#10711)	6 years ago
fonts	…
mastodon	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
mastodon-light	Use `<use />` to render transparent SVG logo instead of inserting it (#10845)	6 years ago
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…