Merge "Make it possible to override SpecialPreferences::showResetForm()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Nov 2017 17:36:44 +0000 (17:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Nov 2017 17:36:44 +0000 (17:36 +0000)

Trivial merge