From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 23 Oct 2014 18:24:48 +0000 (+0000)
Subject: Merge "Respect $wgApiFrameOptions in formatted API output mode"
X-Git-Tag: 1.31.0-rc.0~13500
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=675b96706edd63f1e9d7e8237619634bba0a1486;p=lhc%2Fweb%2Fwiklou.git

Merge "Respect $wgApiFrameOptions in formatted API output mode"
---

675b96706edd63f1e9d7e8237619634bba0a1486