From: rinpatch <rinpatch@sdf.org>
Date: Tue, 13 Aug 2019 22:51:15 +0000 (+0000)
Subject: Merge branch 'feature/mrf-vocabulary' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9ef31767f23b908f276c6cbd44b0bd46373f91fe;p=akkoma

Merge branch 'feature/mrf-vocabulary' into 'develop'

MRF Vocabulary

See merge request pleroma/pleroma!1559
---

9ef31767f23b908f276c6cbd44b0bd46373f91fe