Merge "Replace deprecated language codes in user options"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Jun 2018 13:56:36 +0000 (13:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Jun 2018 13:56:36 +0000 (13:56 +0000)
1  2 
includes/user/User.php

Simple merge