1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 02:58:09 +01:00

Merge branch 'master' into i432PersistFormState

This commit is contained in:
Dan Finlay 2016-08-25 15:27:37 -07:00 committed by GitHub
commit a1fd2b6688
2 changed files with 7 additions and 1 deletions

View File

@ -4,3 +4,9 @@ machine:
dependencies:
pre:
- "npm i -g testem"
override:
- sudo apt-get install libxss1 libappindicator1 libindicator7 lsb-base
- curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- sudo dpkg -i google-chrome.deb
- sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
- rm google-chrome.deb

View File

@ -77,7 +77,7 @@
"through2": "^2.0.1",
"vreme": "^3.0.2",
"web3": "^0.17.0-alpha",
"web3-provider-engine": "^7.8.3",
"web3-provider-engine": "^8.0.2",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},