Merge "Displaying interwiki results in sidebar"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 3 Feb 2017 19:04:54 +0000 (19:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 3 Feb 2017 19:04:54 +0000 (19:04 +0000)
1  2 
autoload.php
includes/DefaultSettings.php
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

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