Merge "Show a warning in edit preview when a template loop is detected"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 11 Sep 2017 18:26:11 +0000 (18:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 11 Sep 2017 18:26:11 +0000 (18:26 +0000)
1  2 
includes/parser/Parser.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge