mastodon/spec/controllers/api/v1
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
..
accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
apps
…
instances
…
lists
…
polls
…
push
…
statuses
…
timelines
…
accounts_controller_spec.rb
…
apps_controller_spec.rb
…
blocks_controller_spec.rb
…
bookmarks_controller_spec.rb
…
conversations_controller_spec.rb
…
custom_emojis_controller_spec.rb
…
domain_blocks_controller_spec.rb
…
endorsements_controller_spec.rb
…
favourites_controller_spec.rb
…
filters_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
…
polls_controller_spec.rb
…
reports_controller_spec.rb
…
search_controller_spec.rb
…
statuses_controller_spec.rb
…
streaming_controller_spec.rb
…
suggestions_controller_spec.rb
…