ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-08-01 18:57:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/os-open-zoomstack

Browse Source 
Conflicts:
	src/config/styles.json
This commit is contained in:
orangemug
2018-09-24 21:14:55 +01:00
parent db6b9ac176 aa50785c12
commit 6b94e9b78b
17 changed files with 136 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/tilesets.json
-5
View File
@@ -1,9 +1,4 @@
{
"mapbox-streets": {
"type": "vector",
"url": "mapbox://mapbox.mapbox-streets-v7",
"title": "Mapbox Streets"
},
"openmaptiles": {
"type": "vector",
"url": "https://free.tilehosting.com/data/v3.json?key={key}",