Merge remote-tracking branch 'origin/next' into patch-2

This commit is contained in:
impinball 2015-11-19 18:12:43 -05:00
commit f673306d6c
4 changed files with 7 additions and 8 deletions

View file

@ -43,7 +43,7 @@ describe("m.trust()", function () {
// FIXME: this is a bug (trusted string's contents rendered as just
// textual contents)
xit("works with mixed trusted content in td", function () {
it("works with mixed trusted content in td", function () {
var root = document.createElement("table")
root.appendChild(root = document.createElement("tr"))