Merge "Add action=query&meta=languageinfo API module"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 4 Jun 2019 20:03:38 +0000 (20:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 4 Jun 2019 20:03:38 +0000 (20:03 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Jun 2019 20:03:38 +0000 (20:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Jun 2019 20:03:38 +0000 (20:03 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/api/ApiQuery.php
Simple merge
diff --cc includes/api/i18n/en.json
Simple merge
diff --cc includes/api/i18n/qqq.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 4 Jun 2019 20:03:38 +0000 (20:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 4 Jun 2019 20:03:38 +0000 (20:03 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiQuery.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history