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 a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		7 years ago
..
fonts	…
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
application.scss	Replace drawer elephant graphic with a vector image (#6286)	7 years ago
mailer.scss	Improve HTML e-mails based on Litmus tests (#6301)	7 years ago
win95.scss	Strip trailing whitespace on win95.scss	7 years ago