projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f4469dc
5954013
)
Merge branch '1723-token-fixes' into 'develop'
author
lain
<lain@soykaf.club>
Thu, 9 Jul 2020 13:10:05 +0000
(13:10 +0000)
committer
lain
<lain@soykaf.club>
Thu, 9 Jul 2020 13:10:05 +0000
(13:10 +0000)
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
1
2
lib/pleroma/web/api_spec/operations/account_operation.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/controllers/account_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/api_spec/operations/account_operation.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge
diff --cc
test/web/mastodon_api/controllers/account_controller_test.exs
Simple merge