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

Merge branch 'master' into 60

Browse Source
This commit is contained in:
Gregory Wolanski
2018-01-18 23:58:06 +01:00
committed by GitHub
parent 6a6595d971 390e90e8c2
commit 0ba11b94c8
5 changed files with 128 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "maputnik",
"version": "1.0.1",
"version": "1.1.0-beta",
"description": "A MapboxGL visual style editor",
"main": "''",
"scripts": {
@@ -32,7 +32,7 @@
"lodash.clonedeep": "^4.5.0",
"lodash.isequal": "^4.5.0",
"lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.41.0",
"mapbox-gl": "^0.43.0",
"mapbox-gl-inspect": "^1.2.5",
"maputnik-design": "github:maputnik/design",
"mousetrap": "^1.6.1",