Merge "Expand templates: Change 'text' to 'wikitext'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 2 Jan 2018 18:14:07 +0000 (18:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 2 Jan 2018 18:14:07 +0000 (18:14 +0000)

Trivial merge