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 c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.		4 years ago
..
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	4 years ago
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mastodon-light	Add duration parameter to muting. (#13831)	4 years ago
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…