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.

2019-04-08 15:57:56 +02:00

..

credentials_controller_spec.rb

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

2018-07-09 07:13:59 +02:00

follower_accounts_controller_spec.rb

Improve blocked view of profiles (#10491)

2019-04-07 04:59:13 +02:00

following_accounts_controller_spec.rb

Improve blocked view of profiles (#10491)

2019-04-07 04:59:13 +02:00

lists_controller_spec.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

pins_controller_spec.rb

Add specs for Accounts::PinsController (#9542)

2018-12-17 06:03:51 +01:00

relationships_controller_spec.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

search_controller_spec.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

statuses_controller_spec.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00