Merge remote-tracking branch 'github/pull/288'

author Tom Hughes <tom@compton.nu>

Tue, 24 Mar 2020 15:03:48 +0000 (15:03 +0000)

committer Tom Hughes <tom@compton.nu>

Tue, 24 Mar 2020 15:03:48 +0000 (15:03 +0000)
author Tom Hughes <tom@compton.nu>
Tue, 24 Mar 2020 15:03:48 +0000 (15:03 +0000)
committer Tom Hughes <tom@compton.nu>
Tue, 24 Mar 2020 15:03:48 +0000 (15:03 +0000)
diff --cc cookbooks/tilecache/templates/default/nginx_tile.conf.erb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Tue, 24 Mar 2020 15:03:48 +0000 (15:03 +0000)
committer	Tom Hughes <tom@compton.nu>
	Tue, 24 Mar 2020 15:03:48 +0000 (15:03 +0000)