Merge branch 'master' into stable
commita08ab6e8bbc9e2d4a007974a0f7a61957eb99cbe
authorGuy Brand <gb@unistra.fr>
Sun, 22 Apr 2018 11:15:03 +0000 (22 13:15 +0200)
committerGuy Brand <gb@unistra.fr>
Sun, 22 Apr 2018 11:15:03 +0000 (22 13:15 +0200)
treedc6295eb859ebccb2223a5fb446ef3b9cbafebb7
parent95e31f59afa15c272bfb9c96d933f7404040e4ef
parent8ca3665ea10b9e2b70b6a87462685e577510eb15
Merge branch 'master' into stable
inc/parser/xhtml.php