Merge branch 'feature/admin-api' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 22 Nov 2018 00:28:04 +0000 (00:28 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 22 Nov 2018 00:28:04 +0000 (00:28 +0000)
Add a admin API

See merge request pleroma/pleroma!366

1  2 
lib/pleroma/web/router.ex

Simple merge