ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-08-25 14:37:27 +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-lock.json
Generated
+4 -4
View File
@@ -1,6 +1,6 @@
{
"name": "maputnik",
"version": "1.1.0-beta",
"version": "1.1.0-beta3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -7945,9 +7945,9 @@
}
},
"mapbox-gl-inspect": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.2.4.tgz",
"integrity": "sha1-7WD6SfXlS4JieOFKthJQqYYKYjU=",
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.2.6.tgz",
"integrity": "sha512-4qOIuLa+I81Nj67NEtcxn+AdigysIMkY57j1cb1C0k1/yHTvq5viCZozjfTRavhLRBj1NDmoWJTi0A1mGpz2JQ==",
"requires": {
"lodash.isequal": "4.5.0",
"randomcolor": "0.4.4"