ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-06-18 13:17:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into maintenance/update-deps-20200217-v2

Browse Source
This commit is contained in:
orangemug
2020-02-18 19:10:20 +00:00
parent 5a47a96f09 c6ba4f66e2
commit ba9d21c045
6 changed files with 349 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -1
View File
@@ -39,7 +39,7 @@
"lodash.throttle": "^4.1.1",
"mapbox-gl": "^1.7.0",
"mapbox-gl-inspect": "^1.3.1",
"maputnik-design": "github:maputnik/design",
"maputnik-design": "github:maputnik/design#f7a2b4d",
"ol": "^6.2.1",
"ol-mapbox-style": "^6.0.1",
"prop-types": "^15.7.2",
@@ -125,6 +125,7 @@
"eslint-plugin-react": "^7.18.3",
"express": "^4.17.1",
"file-loader": "^5.0.2",
"html-webpack-inline-svg-plugin": "^1.3.0",
"html-webpack-plugin": "^3.2.0",
"is-docker": "^2.0.0",
"istanbul": "^0.4.5",