Merge pull request #1447 from nextcloud/password-confirmation-for-some-actions

author Morris Jobke <hey@morrisjobke.de>

Fri, 18 Nov 2016 14:42:30 +0000 (15:42 +0100)

committer GitHub <noreply@github.com>

Fri, 18 Nov 2016 14:42:30 +0000 (15:42 +0100)
author Morris Jobke <hey@morrisjobke.de>
Fri, 18 Nov 2016 14:42:30 +0000 (15:42 +0100)
committer GitHub <noreply@github.com>
Fri, 18 Nov 2016 14:42:30 +0000 (15:42 +0100)
diff --cc settings/Controller/AuthSettingsController.php
Simple merge
diff --cc settings/js/authtoken_view.js
Simple merge
diff --cc tests/Settings/Controller/AuthSettingsControllerTest.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Fri, 18 Nov 2016 14:42:30 +0000 (15:42 +0100)
committer	GitHub <noreply@github.com>
	Fri, 18 Nov 2016 14:42:30 +0000 (15:42 +0100)
		1	2
settings/Controller/AuthSettingsController.php	patch \|	diff1 \|	diff2 \|	blob \| history
settings/js/authtoken_view.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Settings/Controller/AuthSettingsControllerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history