Merge "Move default logo to resources/assets/ directory"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 21 Sep 2014 05:23:53 +0000 (05:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 21 Sep 2014 05:23:53 +0000 (05:23 +0000)
1  2 
includes/DefaultSettings.php
includes/installer/Installer.php

Simple merge
Simple merge