Merge "Only return CORS headers in the response as required"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 31 Dec 2014 18:05:02 +0000 (18:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 31 Dec 2014 18:05:02 +0000 (18:05 +0000)
1  2 
includes/api/ApiMain.php

Simple merge