Mercurial > public > sg101
changeset 865:08bae2b1d2d1
Merge with main line.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Wed, 03 Dec 2014 19:24:53 -0600 |
parents | 0ffdb434d2dd (current diff) 928b97ec55a7 (diff) |
children | 98adae6e13a1 |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/html.py Tue Dec 02 21:16:46 2014 -0600 +++ b/core/html.py Wed Dec 03 19:24:53 2014 -0600 @@ -10,7 +10,7 @@ 'comments': ( [ 'a', 'b', 'blockquote', 'br', 'code', 'del', 'em', - 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', + 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'li', 'ol', 'p', 'pre', 'strong', 'ul', ], { @@ -23,7 +23,7 @@ [ 'a', 'b', 'blockquote', 'br', 'caption', 'center', 'code', 'col', 'colgroup', 'dd', 'del', 'div', 'dl', 'dt', 'em', - 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', + 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'li', 'ol', 'p', 'pre', 'small', 'strike', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u', 'ul',