Merge pull request #21668 from owncloud/add-super-evil-and-hidden-config-switch-to...

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

Wed, 13 Jan 2016 09:30:02 +0000 (10:30 +0100)

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

Wed, 13 Jan 2016 09:30:02 +0000 (10:30 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Wed, 13 Jan 2016 09:30:02 +0000 (10:30 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Wed, 13 Jan 2016 09:30:02 +0000 (10:30 +0100)
diff --cc lib/private/integritycheck/checker.php
Simple merge
diff --cc lib/private/integritycheck/helpers/environmenthelper.php
Simple merge
diff --cc lib/private/updater.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Wed, 13 Jan 2016 09:30:02 +0000 (10:30 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Wed, 13 Jan 2016 09:30:02 +0000 (10:30 +0100)
		1	2
lib/private/integritycheck/checker.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/integritycheck/helpers/environmenthelper.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/updater.php	patch \|	diff1 \|	diff2 \|	blob \| history