Merge "OOUI theme support"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 2 Jun 2015 17:28:09 +0000 (17:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 2 Jun 2015 17:28:09 +0000 (17:28 +0000)
1  2 
autoload.php
docs/extension.schema.json
resources/Resources.php

diff --cc autoload.php
Simple merge
Simple merge
Simple merge