Merge branch 'bugfix/html-scrub-schemes' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 18 Oct 2018 14:36:40 +0000 (14:36 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 18 Oct 2018 14:36:40 +0000 (14:36 +0000)
commitad3181895c2ce14191ca4ada0d86346947428610
tree34190b6fa74e3a7a34a02b6dd7fe1ee464bdd988
parent6098070234f7d84a32cc918d709efd07520e0b99
parent595d855f0ebd88faede51bf3e08384e956465722
Merge branch 'bugfix/html-scrub-schemes' into 'develop'

lib/pleroma/html.ex: Fix scheme lists

See merge request pleroma/pleroma!377
lib/pleroma/formatter.ex