Merge pull request #8110 from zeha/urls-https

author Peter van Dijk <peter.van.dijk@powerdns.com>

Tue, 6 Aug 2019 09:17:01 +0000 (11:17 +0200)

committer GitHub <noreply@github.com>

Tue, 6 Aug 2019 09:17:01 +0000 (11:17 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 6 Aug 2019 09:17:01 +0000 (11:17 +0200)
committer GitHub <noreply@github.com>
Tue, 6 Aug 2019 09:17:01 +0000 (11:17 +0200)
diff --cc README.md
Simple merge
diff --cc docs/changelog/4.0.rst
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 6 Aug 2019 09:17:01 +0000 (11:17 +0200)
committer	GitHub <noreply@github.com>
	Tue, 6 Aug 2019 09:17:01 +0000 (11:17 +0200)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/changelog/4.0.rst	patch \|	diff1 \|	diff2 \|	blob \| history