Merge "API: Allow for documenting individual values of 'prop' parameters"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 22 Dec 2014 21:54:45 +0000 (21:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 22 Dec 2014 21:54:45 +0000 (21:54 +0000)
1  2 
includes/api/i18n/en.json

Simple merge