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)
commit675653ceb78e4a64d8375904e555cdd62f064e21
tree1f0cb4e0f4fa3a3f9a28cd9cf5a17da04cbfbc1c
parent182e3e8da2e5dbb8e8b7b514ad8bbdf242b37b59
parent52681f7fd01c17876b03176cd82b299e6a342d56
Merge branch 'feature/admin-api' into 'develop'

Add a admin API

See merge request pleroma/pleroma!366
lib/pleroma/web/router.ex