You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		5 years ago
..
credentials_controller_spec.rb	…
follower_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	5 years ago
following_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	5 years ago
lists_controller_spec.rb	…
pins_controller_spec.rb	…
relationships_controller_spec.rb	…
search_controller_spec.rb	…
statuses_controller_spec.rb	…