Merge "Rehabilitate DateFormatter"

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

Thu, 11 Apr 2019 06:45:16 +0000 (06:45 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 11 Apr 2019 06:45:16 +0000 (06:45 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 11 Apr 2019 06:45:16 +0000 (06:45 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 11 Apr 2019 06:45:16 +0000 (06:45 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/ServiceWiring.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 11 Apr 2019 06:45:16 +0000 (06:45 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 11 Apr 2019 06:45:16 +0000 (06:45 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/ServiceWiring.php	patch \|	diff1 \|	diff2 \|	blob \| history