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 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system		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	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