projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e8759cb
385356a
)
Merge branch 'fix-admin-api-scope' into 'develop'
author
lain
<lain@soykaf.club>
Mon, 20 Jan 2020 12:07:12 +0000
(12:07 +0000)
committer
lain
<lain@soykaf.club>
Mon, 20 Jan 2020 12:07:12 +0000
(12:07 +0000)
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
1
2
lib/pleroma/web/admin_api/admin_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/admin_api/admin_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge
diff --cc
test/web/admin_api/admin_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff