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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
contrast	Fix text colors (#7227)	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	Improve style of notice/alert messages (#8973)	6 years ago
application.scss	Redesign public profiles and toots (#8068)	6 years ago
contrast.scss	Separate high contrast theme (#7213)	6 years ago
mailer.scss	Separate font-family into variable (#8763)	6 years ago
mastodon-light.scss	More polished light theme (#7620)	6 years ago
win95.scss	Strip trailing whitespace on win95.scss	6 years ago