Merge pull request #3634 from AntonKhorev/map-key-tooltip

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

Wed, 3 Aug 2022 14:38:58 +0000 (15:38 +0100)

committer GitHub <noreply@github.com>

Wed, 3 Aug 2022 14:38:58 +0000 (15:38 +0100)
author Andy Allan <git@gravitystorm.co.uk>
Wed, 3 Aug 2022 14:38:58 +0000 (15:38 +0100)
committer GitHub <noreply@github.com>
Wed, 3 Aug 2022 14:38:58 +0000 (15:38 +0100)
diff --cc app/assets/javascripts/application.js
Simple merge
diff --cc app/assets/javascripts/leaflet.key.js
Simple merge
diff --cc app/assets/javascripts/leaflet.layers.js
Simple merge
author	Andy Allan <git@gravitystorm.co.uk>
	Wed, 3 Aug 2022 14:38:58 +0000 (15:38 +0100)
committer	GitHub <noreply@github.com>
	Wed, 3 Aug 2022 14:38:58 +0000 (15:38 +0100)
		1	2
app/assets/javascripts/application.js	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/javascripts/leaflet.key.js	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/javascripts/leaflet.layers.js	patch \|	diff1 \|	diff2 \|	blob \| history