Merge branch 'feature/staff-discovery-api' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 15:00:56 +0000 (15:00 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 15:00:56 +0000 (15:00 +0000)
staff discovery api

See merge request pleroma/pleroma!326


Trivial merge