Merge "Fix phpdoc for type hint for User::makeUpdateConditions()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 8 Apr 2019 04:51:21 +0000 (04:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 8 Apr 2019 04:51:21 +0000 (04:51 +0000)

Trivial merge