Merge "Split editcascadeprotected permission from protect permission"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 12 May 2016 20:37:00 +0000 (20:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 12 May 2016 20:37:00 +0000 (20:37 +0000)
commitc8b0af1546e339e515f8f835c184db952ae30aad
treef84e916e98b77a9903dcec4b02a5addbd8c7c224
parent7ed799da9d5c1e943977d88f5bfc6d5eea7b021f
parentda3464badaf9c067a4c3d98448ca72a8324e1e19
Merge "Split editcascadeprotected permission from protect permission"
includes/DefaultSettings.php
includes/Title.php
includes/user/User.php
languages/i18n/en.json
languages/i18n/qqq.json