mastodon/spec/controllers/api/v1
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
2018-05-11 18:12:42 +02:00
..
accounts
…
apps
…
lists
…
push
…
statuses
…
timelines
…
accounts_controller_spec.rb
…
apps_controller_spec.rb
…
blocks_controller_spec.rb
…
bookmarks_controller_spec.rb
…
custom_emojis_controller_spec.rb
…
domain_blocks_controller_spec.rb
…
favourites_controller_spec.rb
…
follow_requests_controller_spec.rb
…
follows_controller_spec.rb
…
instances_controller_spec.rb
…
lists_controller_spec.rb
…
media_controller_spec.rb
…
mutes_controller_spec.rb
…
notifications_controller_spec.rb
…
reports_controller_spec.rb
…
search_controller_spec.rb
…
statuses_controller_spec.rb
…
streaming_controller_spec.rb
…