Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

credentials_controller_spec.rb

…

follower_accounts_controller_spec.rb

Hide blocking accounts from blocked users (#10442)

2019-04-01 20:06:13 +02:00

following_accounts_controller_spec.rb

Hide blocking accounts from blocked users (#10442)

2019-04-01 20:06:13 +02:00

lists_controller_spec.rb

…

pins_controller_spec.rb

…

relationships_controller_spec.rb

…

search_controller_spec.rb

…

statuses_controller_spec.rb

…