David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

2018-04-18 18:48:12 -05:00

..

activitypub

…

admin

…

api

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

auth

…

concerns

…

oauth

…

settings

…

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

…

application_controller.rb

…

authorize_follows_controller.rb

…

emojis_controller.rb

…

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

home_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

intents_controller.rb

…

invites_controller.rb

…

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

remote_follow_controller.rb

…

remote_unfollows.rb

…

shares_controller.rb

…

statuses_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

stream_entries_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

tags_controller.rb

…