Merge pull request #1602 from nextcloud/ignore-mod-env

author Lukas Reschke <lukas@statuscode.ch>

Fri, 18 Nov 2016 20:42:56 +0000 (21:42 +0100)

committer GitHub <noreply@github.com>

Fri, 18 Nov 2016 20:42:56 +0000 (21:42 +0100)
author Lukas Reschke <lukas@statuscode.ch>
Fri, 18 Nov 2016 20:42:56 +0000 (21:42 +0100)
committer GitHub <noreply@github.com>
Fri, 18 Nov 2016 20:42:56 +0000 (21:42 +0100)
diff --cc lib/private/Template/JSConfigHelper.php
Simple merge
diff --cc lib/private/URLGenerator.php
Simple merge
author	Lukas Reschke <lukas@statuscode.ch>
	Fri, 18 Nov 2016 20:42:56 +0000 (21:42 +0100)
committer	GitHub <noreply@github.com>
	Fri, 18 Nov 2016 20:42:56 +0000 (21:42 +0100)
		1	2
lib/private/Template/JSConfigHelper.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/URLGenerator.php	patch \|	diff1 \|	diff2 \|	blob \| history