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)
commitb3970523a37d71997786683de214e2e1452b60fd
tree128995cc21a3da5f3b73ed71a7f984605719305f
parent5ce3296a3b2ce7d00110ee784ad1cb37336da256
parent6380e81cd0c2dcfe387f2fcc8646a3ab1165b57d
Merge "Add support for JSON i18n files"
includes/DefaultSettings.php