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)
commit8143251f06b1a781ee20924c89be484e514f0bec
tree5df0e23a10b29ee0dd31887919b8858253800296
parent1c9e539b47ff594d75c9548a04e64cb0c61cff8c
parent76c67a41c12a80138e984fa782d7396da53b8d32
Merge branch 'feature/staff-discovery-api' into 'develop'

staff discovery api

See merge request pleroma/pleroma!326