Merge pull request #20241 from nextcloud/fix/license-headers-19

author Roeland Jago Douma <rullzer@users.noreply.github.com>

Wed, 1 Apr 2020 10:44:21 +0000 (12:44 +0200)

committer GitHub <noreply@github.com>

Wed, 1 Apr 2020 10:44:21 +0000 (12:44 +0200)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Wed, 1 Apr 2020 10:44:21 +0000 (12:44 +0200)
committer GitHub <noreply@github.com>
Wed, 1 Apr 2020 10:44:21 +0000 (12:44 +0200)
diff --cc lib/base.php
Simple merge
diff --cc lib/private/Config.php
Simple merge
diff --cc lib/private/Server.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Wed, 1 Apr 2020 10:44:21 +0000 (12:44 +0200)
committer	GitHub <noreply@github.com>
	Wed, 1 Apr 2020 10:44:21 +0000 (12:44 +0200)
		1	2
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/Config.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/Server.php	patch \|	diff1 \|	diff2 \|	blob \| history