ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-01-07 05:50:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/add-thunderforest-source

Browse Source 
Conflicts:
	src/components/App.jsx
This commit is contained in:
orangemug
2018-07-27 15:43:02 +01:00
parent 45bdf53a41 cc51774259
commit fd59f42819
90 changed files with 11345 additions and 6012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/styles.json
View File

@@ -26,8 +26,8 @@
{
"id": "osm-liberty",
"title": "OSM Liberty",
"url": "https://rawgit.com/lukasmartinelli/osm-liberty/gh-pages/style.json",
"thumbnail": "https://cdn.rawgit.com/lukasmartinelli/osm-liberty/gh-pages/thumbnail.png"
"url": "https://rawgit.com/maputnik/osm-liberty/gh-pages/style.json",
"thumbnail": "https://cdn.rawgit.com/maputnik/osm-liberty/gh-pages/thumbnail.png"
},
{
"id": "empty-style",