Merge "Move condition to not show form one level up"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 9 Nov 2016 16:18:51 +0000 (16:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 9 Nov 2016 16:18:51 +0000 (16:18 +0000)
1  2 
includes/EditPage.php

Simple merge