Merge branch 'feature/mention-mrf' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Wed, 17 Jul 2019 15:28:41 +0000 (15:28 +0000)
committerkaniini <ariadne@dereferenced.org>
Wed, 17 Jul 2019 15:28:41 +0000 (15:28 +0000)
Add MRF MentionPolicy for dropping posts which mention specific actors

See merge request pleroma/pleroma!1439

1  2 
CHANGELOG.md
docs/config.md

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