David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		2018-05-18 08:47:10 -05:00
..
contrast	Fix text colors (#7227)	2018-04-22 14:29:40 +02:00
fonts
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
application.scss
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss
mastodon-light.scss	Add a light theme	2018-05-04 20:25:58 +02:00
win95.scss