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		2018-03-02 21:46:44 -06:00
..
fonts	Font styles are now packagified	2017-11-18 11:05:00 -08:00
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
application.scss	Replace drawer elephant graphic with a vector image (#6286)	2018-01-19 15:25:27 +01:00
mailer.scss	Improve HTML e-mails based on Litmus tests (#6301)	2018-01-20 01:32:21 +01:00
win95.scss	Strip trailing whitespace on win95.scss	2018-01-18 10:54:50 -06:00