Merge "Add grant for access to private information"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 15 Aug 2016 20:25:56 +0000 (20:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 15 Aug 2016 20:25:56 +0000 (20:25 +0000)
1  2 
includes/DefaultSettings.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge