Merge pull request #20878 from owncloud/proper-htaccess-support-in-code-signing-checker

author Thomas Müller <thomas.mueller@tmit.eu>

Fri, 11 Dec 2015 10:46:37 +0000 (11:46 +0100)

committer Thomas Müller <thomas.mueller@tmit.eu>

Fri, 11 Dec 2015 10:46:37 +0000 (11:46 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Fri, 11 Dec 2015 10:46:37 +0000 (11:46 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Fri, 11 Dec 2015 10:46:37 +0000 (11:46 +0100)
diff --cc .htaccess
Simple merge
diff --cc lib/private/setup.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 11 Dec 2015 10:46:37 +0000 (11:46 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 11 Dec 2015 10:46:37 +0000 (11:46 +0100)
		1	2
.htaccess	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history