diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-05-30 16:50:18 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-05-30 16:50:18 +0100 |
| commit | e4e5a8dbe22d2c4be7540e8d70861990907a0b27 (patch) | |
| tree | bcd79aa757577c62e7366e9f2f3bc271a285cc7e | |
| parent | 337dd65c47770382284c3252ffa07b538b52e0ce (diff) | |
| parent | eb2d7d8c9f1d2a562453a2a6a9376884828e28e4 (diff) | |
| download | mullvadvpn-e4e5a8dbe22d2c4be7540e8d70861990907a0b27.tar.xz mullvadvpn-e4e5a8dbe22d2c4be7540e8d70861990907a0b27.zip | |
Merge branch 'hotfix/mapbox-peer-dependency'
| -rw-r--r-- | .flowconfig | 1 | ||||
| -rw-r--r-- | package.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.flowconfig b/.flowconfig index 973719fa76..d65c855ee9 100644 --- a/.flowconfig +++ b/.flowconfig @@ -1,4 +1,5 @@ [ignore] +.*/node_modules/mapbox-gl/.* .*/node_modules/cheap-ruler/.* .*/node_modules/jsonlint-lines-primitives/.* .*/node_modules/unflowify/.* diff --git a/package.json b/package.json index 6095d4db6e..02484e0b36 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "electron-log": "^2.2.0", "history": "^4.6.1", "jsonrpc-lite": "^1.2.3", + "mapbox-gl": "^0.36.0", "moment": "^2.17.1", "react": "^15.4.2", "react-custom-scrollbars": "^4.0.2", |