mastodon/spec/controllers/api/v1/accounts
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
..
credentials_controller_spec.rb
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
lists_controller_spec.rb
relationships_controller_spec.rb Fix bug in relationships API introduced by #6482 (#6527) 2018-02-21 23:22:12 +01:00
search_controller_spec.rb
statuses_controller_spec.rb