Merge "(bug 39180) Set x-frame-options='DENY' for api"
authorDemon <chadh@wikimedia.org>
Fri, 31 Aug 2012 14:47:28 +0000 (14:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 31 Aug 2012 14:47:28 +0000 (14:47 +0000)
1  2 
includes/DefaultSettings.php

Simple merge