Merge "Stop overwriting $cache in User::getCacheKey()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 7 Feb 2019 16:57:13 +0000 (16:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 7 Feb 2019 16:57:13 +0000 (16:57 +0000)
1  2 
includes/user/User.php

Simple merge