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

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

Browse Source 
Conflicts:
	package-lock.json
	src/components/inputs/AutocompleteInput.jsx
This commit is contained in:
orangemug
2018-01-22 09:57:54 +00:00
parent e64ca3eb93 2d2f9744e2
commit 4215b5808f
9 changed files with 91 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "maputnik",
"version": "1.1.0-beta",
"version": "1.1.0-beta3",
"description": "A MapboxGL visual style editor",
"main": "''",
"scripts": {
@@ -33,7 +33,7 @@
"lodash.isequal": "^4.5.0",
"lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.43.0",
"mapbox-gl-inspect": "^1.2.4",
"mapbox-gl-inspect": "^1.2.6",
"maputnik-design": "github:maputnik/design",
"mousetrap": "^1.6.1",
"ol-mapbox-style": "^1.0.1",