mastodon/app/controllers/api/v1
Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
2018-08-31 19:10:57 +02:00
..
accounts
…
apps
…
instances
…
lists
…
push
…
statuses
…
timelines
…
accounts_controller.rb
…
apps_controller.rb
…
blocks_controller.rb
…
bookmarks_controller.rb
…
custom_emojis_controller.rb
…
domain_blocks_controller.rb
…
endorsements_controller.rb
…
favourites_controller.rb
…
filters_controller.rb
…
follow_requests_controller.rb
…
follows_controller.rb
…
instances_controller.rb
…
lists_controller.rb
…
media_controller.rb
…
mutes_controller.rb
…
notifications_controller.rb
…
reports_controller.rb
…
search_controller.rb
…
statuses_controller.rb
…
streaming_controller.rb
…
suggestions_controller.rb
…