Merge branch 'feature/html-scrub-policy' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 16 Sep 2018 01:05:09 +0000 (01:05 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 16 Sep 2018 01:05:09 +0000 (01:05 +0000)
commitc2650f0ffb5938005baf437dfa69bbf05da0cc71
treef0b86511148be7e631697cb0f25af5dfebae66fe
parent90661e20cf91b2b1e95fdee73f2e95aa18c1be65
parente82ce2a4b396e448181c7729db6dd850944db140
Merge branch 'feature/html-scrub-policy' into 'develop'

html scrub policy

See merge request pleroma/pleroma!339
lib/pleroma/web/mastodon_api/views/status_view.ex