David Yip c2f7676dfc Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 3114ac9655. It was resolved by accepting tootsuite's changes.		2018-06-07 05:13:49 -05:00
..
contrast	Fix text colors (#7227)	2018-04-22 14:29:40 +02:00
fonts	Font styles are now packagified	2017-11-18 11:05:00 -08:00
mastodon	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-06-07 05:13:49 -05:00
mastodon-light	Change border color of activity-stream (#7724)	2018-06-04 13:13:31 +02:00
application.scss	Replace drawer elephant graphic with a vector image (#6286)	2018-01-19 15:25:27 +01:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	Improve HTML e-mails based on Litmus tests (#6301)	2018-01-20 01:32:21 +01:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Strip trailing whitespace on win95.scss	2018-01-18 10:54:50 -06:00