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 c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.		6 years ago
..
contrast	Fix some colors of high contrast theme (#10711)	6 years ago
fonts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon-light	Fix some colors in light theme (#10754)	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