David Yip 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		2018-01-21 13:36:10 -06:00
..
fonts
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-21 13:36:10 -06:00
application.scss
mailer.scss	Improve HTML e-mails based on Litmus tests (#6301)	2018-01-20 01:32:21 +01:00
win95.scss