Merge "Revert "Split editcascadeprotected permission from protect permission""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 12 May 2016 21:53:41 +0000 (21:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 12 May 2016 21:53:41 +0000 (21:53 +0000)
commit279dd4156c6195be16fe497980d73cd2e5c95884
treee9f9a357d21e86a43b1b3f10acdf52df4ccaa5af
parent6b9619a3a73dd8b15e1891d1294056f258e7536d
parentabc68e63787e8df6199774882ce36c8da101f44b
Merge "Revert "Split editcascadeprotected permission from protect permission""
includes/DefaultSettings.php
includes/Title.php
includes/user/User.php
languages/i18n/en.json
languages/i18n/qqq.json