From: kaniini <nenolod@gmail.com>
Date: Mon, 3 Sep 2018 15:00:56 +0000 (+0000)
Subject: Merge branch 'feature/staff-discovery-api' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8143251f06b1a781ee20924c89be484e514f0bec;p=akkoma

Merge branch 'feature/staff-discovery-api' into 'develop'

staff discovery api

See merge request pleroma/pleroma!326
---

8143251f06b1a781ee20924c89be484e514f0bec