Merge branch 'master' of github.com:tootsuite/mastodon

.eslintrc.yml

.ruby-version

.travis.yml

Dockerfile

app/controllers/admin/accounts_controller.rb

...ntrollers/api/v1/accounts/follower_accounts_controller.rb

...trollers/api/v1/accounts/following_accounts_controller.rb

app/controllers/api/v1/accounts/statuses_controller.rb

app/controllers/api/v1/blocks_controller.rb

app/controllers/api/v1/domain_blocks_controller.rb

app/controllers/api/v1/favourites_controller.rb

app/controllers/api/v1/follow_requests_controller.rb

app/controllers/api/v1/lists/accounts_controller.rb

app/controllers/api/v1/mutes_controller.rb

app/controllers/api/v1/notifications_controller.rb

...lers/api/v1/statuses/favourited_by_accounts_controller.rb

...llers/api/v1/statuses/reblogged_by_accounts_controller.rb

app/controllers/api/v1/statuses_controller.rb

app/controllers/api/v1/timelines/home_controller.rb

app/controllers/api/v1/timelines/list_controller.rb