Merge "Convert file delete to use OOUI"

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

Wed, 1 Aug 2018 17:23:24 +0000 (17:23 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 1 Aug 2018 17:23:24 +0000 (17:23 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 1 Aug 2018 17:23:24 +0000 (17:23 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 1 Aug 2018 17:23:24 +0000 (17:23 +0000)
diff --cc includes/FileDeleteForm.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 1 Aug 2018 17:23:24 +0000 (17:23 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 1 Aug 2018 17:23:24 +0000 (17:23 +0000)
		1	2
includes/FileDeleteForm.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history