Merge pull request #11786 from nextcloud/feature/password_confirmation_backend

author Morris Jobke <hey@morrisjobke.de>

Mon, 5 Nov 2018 23:44:18 +0000 (00:44 +0100)

committer GitHub <noreply@github.com>

Mon, 5 Nov 2018 23:44:18 +0000 (00:44 +0100)
author Morris Jobke <hey@morrisjobke.de>
Mon, 5 Nov 2018 23:44:18 +0000 (00:44 +0100)
committer GitHub <noreply@github.com>
Mon, 5 Nov 2018 23:44:18 +0000 (00:44 +0100)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Mon, 5 Nov 2018 23:44:18 +0000 (00:44 +0100)
committer	GitHub <noreply@github.com>
	Mon, 5 Nov 2018 23:44:18 +0000 (00:44 +0100)
		1	2
lib/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history