Merge "Allow two-tier setup of transwiki import sources"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 19 Aug 2014 18:35:55 +0000 (18:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 19 Aug 2014 18:35:55 +0000 (18:35 +0000)
commit35c336bc1d99df89dd85e31320492d542919efe8
treeff96714550e5a0db248d50b4544cffd62bc7d4a4
parent92e31275a4f7117a4465b8886dfeca6dcb37351e
parent569c3e862b3277b6f2a4223ddd9b19468f4f4c74
Merge "Allow two-tier setup of transwiki import sources"
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php