Merge "Better pageprops API example"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 Apr 2015 13:43:59 +0000 (13:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Apr 2015 13:43:59 +0000 (13:43 +0000)
1  2 
includes/api/ApiQueryPageProps.php
includes/api/i18n/en.json

Simple merge
Simple merge