Merge pull request #3704 from AntonKhorev/leaflet-control-groups

author Andy Allan <git@gravitystorm.co.uk>

Wed, 19 Oct 2022 14:42:08 +0000 (15:42 +0100)

committer GitHub <noreply@github.com>

Wed, 19 Oct 2022 14:42:08 +0000 (15:42 +0100)
author Andy Allan <git@gravitystorm.co.uk>
Wed, 19 Oct 2022 14:42:08 +0000 (15:42 +0100)
committer GitHub <noreply@github.com>
Wed, 19 Oct 2022 14:42:08 +0000 (15:42 +0100)
diff --cc app/assets/javascripts/index.js
Simple merge
diff --cc app/assets/stylesheets/common.scss
Simple merge
author	Andy Allan <git@gravitystorm.co.uk>
	Wed, 19 Oct 2022 14:42:08 +0000 (15:42 +0100)
committer	GitHub <noreply@github.com>
	Wed, 19 Oct 2022 14:42:08 +0000 (15:42 +0100)
		1	2
app/assets/javascripts/index.js	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/common.scss	patch \|	diff1 \|	diff2 \|	blob \| history