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 f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.		6 years ago
..
credentials_controller_spec.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
follower_accounts_controller_spec.rb	Improve blocked view of profiles (#10491)	6 years ago
following_accounts_controller_spec.rb	Improve blocked view of profiles (#10491)	6 years ago
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	7 years ago
pins_controller_spec.rb	Add specs for Accounts::PinsController (#9542)	6 years ago
relationships_controller_spec.rb	Add more granular OAuth scopes (#7929)	7 years ago
search_controller_spec.rb	Add more granular OAuth scopes (#7929)	7 years ago
statuses_controller_spec.rb	Add more granular OAuth scopes (#7929)	7 years ago