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 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes		7 years ago
..
contrast	Fix text colors (#7227)	7 years ago
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
mastodon-light	Fix color mistakes in mastodon-light theme (#7626)	7 years ago
application.scss	Replace drawer elephant graphic with a vector image (#6286)	7 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Improve HTML e-mails based on Litmus tests (#6301)	7 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Strip trailing whitespace on win95.scss	7 years ago