Merge "Special:Preferences: Use OOjs UI"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 14 Nov 2017 22:52:13 +0000 (22:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 14 Nov 2017 22:52:14 +0000 (22:52 +0000)
1  2 
includes/specials/SpecialPreferences.php
resources/Resources.php

Simple merge