Merge branch 'feature/mrf-user-filter' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 22 May 2019 19:03:14 +0000 (19:03 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 22 May 2019 19:03:14 +0000 (19:03 +0000)
mrf: add support for filtering users

See merge request pleroma/pleroma!1188

1  2 
CHANGELOG.md
docs/config.md

diff --cc CHANGELOG.md
Simple merge
diff --cc docs/config.md
Simple merge