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)
commit28812752918c59bedc3526c0a4ac7c490d1a5b22
treeb768f7bc2f044deb2964638c80549e2468df9a79
parent8eed5938d5fb6cac9075d2b75b69d2c93316db01
parent342ed844464bd32f633959b5fd48711c29c01566
Merge branch 'feature/mrf-scrub' into 'develop'

MRF: html scrubbing filter

See merge request pleroma/pleroma!345