Merge remote-tracking branch 'upstream/3.0' into polltime

This commit is contained in:
Xaekai 2016-07-07 23:06:12 -07:00
commit c3cd84f7af
1 changed files with 6 additions and 1 deletions

View File

@ -5,6 +5,7 @@ var sanitizeHTML = require("sanitize-html");
const ALLOWED_TAGS = [
"button",
"center",
"cite"
"details",
"font",
"h1",
@ -13,8 +14,12 @@ const ALLOWED_TAGS = [
"marquee", // It pains me to do this, but a lot of people use it...
"s",
"section",
"small",
"span",
"summary"
"sub",
"summary",
"sup",
"template"
];
const ALLOWED_ATTRIBUTES = [