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

Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v6

Browse Source 
Conflicts:
	package-lock.json
This commit is contained in:
orangemug
2018-01-18 22:59:59 +00:00
parent dc40ce7d9e 390e90e8c2
commit a822430e1d
5 changed files with 1053 additions and 93 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.4",
"maputnik-design": "github:maputnik/design",
"mousetrap": "^1.6.1",