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.

David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.		7 years ago
..
contrast	Fix text colors (#7227)	7 years ago
fonts	Font styles are now packagified	7 years ago
mastodon	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
mastodon-light	Change border color of activity-stream (#7724)	7 years ago
application.scss	Replace drawer elephant graphic with a vector image (#6286)	7 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Improve HTML e-mails based on Litmus tests (#6301)	7 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Strip trailing whitespace on win95.scss	7 years ago