Merge "Add collation for Abkhaz (ab)"

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

Tue, 23 Jan 2018 18:42:29 +0000 (18:42 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 23 Jan 2018 18:42:29 +0000 (18:42 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Jan 2018 18:42:29 +0000 (18:42 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Jan 2018 18:42:29 +0000 (18:42 +0000)
diff --cc autoload.php
Simple merge
diff --cc tests/phpunit/includes/collation/CustomUppercaseCollationTest.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 23 Jan 2018 18:42:29 +0000 (18:42 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 23 Jan 2018 18:42:29 +0000 (18:42 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/includes/collation/CustomUppercaseCollationTest.php	patch \|	diff1 \|	diff2 \|	blob \| history