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

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

Browse Source 
Conflicts:
	src/styles/index.scss
This commit is contained in:
orangemug
2018-04-16 15:31:27 +01:00
parent c4b92fa0a9 b60df8b074
commit 78a7f152e7
7 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+3 -3
View File
@@ -8025,9 +8025,9 @@
}
},
"mapbox-gl-inspect": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.0.tgz",
"integrity": "sha512-84qABwzuCenZz3oNF8vzqymE5dBoDhEkG5FUdPE2XFXaYabLo4lODRLReMYzeoNPn/4IJFUb9Qy3MN7lGG8CfA==",
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.1.tgz",
"integrity": "sha512-qkcT8lcYQy2x8wn+BUb6a6YXCEIHeGKHlt01/FSf58yYEmeufuihtbCjN9of2JDQm2XeRGdDEksAH7if7tPyyg==",
"requires": {
"lodash.isequal": "4.5.0",
"randomcolor": "0.4.4"