Merge "User: Avoid deprecated Linker::link()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 28 Jun 2017 12:49:55 +0000 (12:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 28 Jun 2017 12:49:55 +0000 (12:49 +0000)
1  2 
includes/user/User.php

Simple merge