Merge pull request #11131 from owncloud/use-phpini-wrapper

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

Mon, 7 Dec 2015 09:20:59 +0000 (10:20 +0100)

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

Mon, 7 Dec 2015 09:20:59 +0000 (10:20 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Mon, 7 Dec 2015 09:20:59 +0000 (10:20 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Mon, 7 Dec 2015 09:20:59 +0000 (10:20 +0100)
diff --cc core/js/config.php
Simple merge
diff --cc lib/private/helper.php
Simple merge
diff --cc lib/private/util.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 7 Dec 2015 09:20:59 +0000 (10:20 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 7 Dec 2015 09:20:59 +0000 (10:20 +0100)
		1	2
core/js/config.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/helper.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/util.php	patch \|	diff1 \|	diff2 \|	blob \| history