Merge branch 'master' into release

pull/4/head
Frode Petterson 2016-02-03 11:28:39 +01:00
commit 4b49a4ff0d
1 changed files with 2 additions and 0 deletions

View File

@ -212,6 +212,7 @@
"sup",
"strong",
"em",
"a",
"p"
]
},
@ -240,6 +241,7 @@
"sup",
"strong",
"em",
"a",
"p"
]
},