Merge "Parser: Allow `<s>` and `<strike>` in table of contents"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 28 Sep 2016 21:31:33 +0000 (21:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 28 Sep 2016 21:31:33 +0000 (21:31 +0000)
1  2 
includes/parser/Parser.php
tests/parser/parserTests.txt

Simple merge
Simple merge