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 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		6 years ago
..
contrast	Fix color of static page links in high contrast theme (#10028)	6 years ago
fonts	…
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	…
mailer.scss	Add moderation warnings (#9519)	6 years ago
mastodon-light.scss	…
win95.scss	Fix syntax errors in win95 SCSS file	6 years ago