Merge branch '1723-token-fixes' into 'develop'
authorlain <lain@soykaf.club>
Thu, 9 Jul 2020 13:10:05 +0000 (13:10 +0000)
committerlain <lain@soykaf.club>
Thu, 9 Jul 2020 13:10:05 +0000 (13:10 +0000)
commit8ca1f3e8c61b906387e9cb6fb8993d2ad496ab3d
treebbacb00a4ef2ae1a1c79b87ebf036baea3e4e6cc
parentf4469dc7419288a46512ea5cae6ffe32de5d47c2
parent59540131c189afb10faf98d1bfeccf8f94985a90
Merge branch '1723-token-fixes' into 'develop'

AccountController: Return scope in proper format.

Closes #1723

See merge request pleroma/pleroma!2694
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
test/web/mastodon_api/controllers/account_controller_test.exs