Merge "Make calling wfMangleFlashPolicy configurable"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 19 Nov 2014 20:14:03 +0000 (20:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 19 Nov 2014 20:14:03 +0000 (20:14 +0000)
1  2 
includes/DefaultSettings.php

Simple merge