Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml

2018-08-27 18:09:28 +02:00

..

activitypub

…

admin

…

api

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-27 18:09:28 +02:00

auth

…

concerns

…

oauth

…

settings

…

well_known

…

about_controller_spec.rb

…

account_follow_controller_spec.rb

…

account_unfollow_controller_spec.rb

…

accounts_controller_spec.rb

…

application_controller_spec.rb

…

authorize_interactions_controller_spec.rb

…

emojis_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

home_controller_spec.rb

…

intents_controller_spec.rb

…

invites_controller_spec.rb

…

manifests_controller_spec.rb

…

media_controller_spec.rb

…

remote_follow_controller_spec.rb

…

remote_unfollows_controller_spec.rb

…

shares_controller_spec.rb

…

statuses_controller_spec.rb

…

stream_entries_controller_spec.rb

…

tags_controller_spec.rb

…