Merge "API: Don't handle non-preflight OPTIONS as CORS"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 29 Jun 2017 22:03:39 +0000 (22:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 29 Jun 2017 22:03:39 +0000 (22:03 +0000)

Trivial merge