Merge "Add support for JSON i18n files"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 20 Dec 2013 13:41:42 +0000 (13:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 20 Dec 2013 13:41:42 +0000 (13:41 +0000)
1  2 
includes/DefaultSettings.php

Simple merge