David Yip 020b40efdb

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml

2018-02-09 09:25:53 -06:00

..

activitypub

Fix response of signature_verification_failure_reason (#6441)

2018-02-08 05:00:45 +01:00

admin

…

api

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-08 23:17:14 +00:00

auth

…

concerns

…

oauth

…

settings

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-09 09:25:53 -06:00

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

…

intents_controller.rb

…

invites_controller.rb

…

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

remote_follow_controller.rb

…

shares_controller.rb

…

statuses_controller.rb

…

stream_entries_controller.rb

…

tags_controller.rb

…