Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
authorlain <lain@soykaf.club>
Thu, 12 Dec 2019 09:28:27 +0000 (09:28 +0000)
committerlain <lain@soykaf.club>
Thu, 12 Dec 2019 09:28:27 +0000 (09:28 +0000)
commit8cb852523a13530ae77b76e4d3253ccd5883e9dc
tree011a01a497868463946a591c4fdd300811160002
parent2aa609db8a43e0eca8b998a4f42de6f0b19011ac
parent82fae3e23f41d02803eeb9c1eb6151955d387102
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'

AdminAPI: Merge account views for list instance statuses

See merge request pleroma/pleroma!2054
lib/pleroma/web/admin_api/admin_api_controller.ex