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 c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		7 years ago
..
fonts	Font styles are now packagified	7 years ago
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