Merge "Fix unexpected return type of User::idFromName()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 3 Dec 2018 18:18:54 +0000 (18:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 3 Dec 2018 18:18:54 +0000 (18:18 +0000)
1  2 
includes/user/User.php

Simple merge