Merge branch 'feature/mrf-scrub' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 16 Sep 2018 01:31:03 +0000 (01:31 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 16 Sep 2018 01:31:03 +0000 (01:31 +0000)
MRF: html scrubbing filter

See merge request pleroma/pleroma!345


Trivial merge