Merge "Do not override content format in EditPage when loading rev."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 21 Jul 2016 22:10:24 +0000 (22:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 21 Jul 2016 22:10:24 +0000 (22:10 +0000)
1  2 
includes/EditPage.php

Simple merge