Merge "Move wfEscapeWikiText() to Parser::escapeWikitext()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 22 Sep 2016 22:02:36 +0000 (22:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 22 Sep 2016 22:02:36 +0000 (22:02 +0000)
1  2 
includes/GlobalFunctions.php

Simple merge