projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2aa609d
82fae3e
)
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
author
lain
<lain@soykaf.club>
Thu, 12 Dec 2019 09:28:27 +0000
(09:28 +0000)
committer
lain
<lain@soykaf.club>
Thu, 12 Dec 2019 09:28:27 +0000
(09:28 +0000)
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
1
2
lib/pleroma/web/admin_api/admin_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge
projects / akkoma / commitdiff