Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		2020-01-04 23:04:42 +01:00
..
credentials_controller_spec.rb
follower_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
following_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
lists_controller_spec.rb
pins_controller_spec.rb
relationships_controller_spec.rb
search_controller_spec.rb
statuses_controller_spec.rb