FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec/controllers/api/v1/accounts
History
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
…
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
…
pins_controller_spec.rb
…
relationships_controller_spec.rb
…
search_controller_spec.rb
…
statuses_controller_spec.rb
…