Merge "Made user preferences load from the master by default"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 30 Mar 2015 15:30:49 +0000 (15:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 30 Mar 2015 15:30:49 +0000 (15:30 +0000)
1  2 
includes/User.php

Simple merge