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 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		6 years ago
..
contrast	Fix color of static page links in high contrast theme (#10028)	6 years ago
fonts	Font styles are now packagified	7 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon-light	Disable box shadows for featured hashtags in light theme (#10034)	6 years ago
application.scss	Add polls (#10111)	6 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Add moderation warnings (#9519)	6 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