aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-10-19 05:20:09 +0800
committerGitHub <noreply@github.com>2016-10-19 05:20:09 +0800
commita88a48ba14a213920ce1becb0b70cf10192ad3e5 (patch)
treeab612b7ba419930aeb073f53cf0f1f3591d56f41
parenta542118a55633468166440986b6421bc3423dc8d (diff)
parentf31fef034fb92420ec6cab3156566b7751333b9c (diff)
downloadtangerine-wallet-browser-a88a48ba14a213920ce1becb0b70cf10192ad3e5.tar.gz
tangerine-wallet-browser-a88a48ba14a213920ce1becb0b70cf10192ad3e5.tar.zst
tangerine-wallet-browser-a88a48ba14a213920ce1becb0b70cf10192ad3e5.zip
Merge pull request #749 from MetaMask/Version-2.13.5
Version 2.13.5
-rw-r--r--CHANGELOG.md2
-rw-r--r--app/manifest.json2
-rw-r--r--package.json2
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eac50a0b1..d6d400b66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+## 2.13.5 2016-10-18
+
- Increase default max gas to `100000` over the RPC's `estimateGas` response.
- Fix bug where slow-loading dapps would sometimes trigger infinite reload loops.
diff --git a/app/manifest.json b/app/manifest.json
index cbce01468..8f5a34ea6 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "2.13.4",
+ "version": "2.13.5",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",
diff --git a/package.json b/package.json
index ea67eee75..2af0aebfc 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"start": "gulp dev",
"lint": "gulp lint",
"dev": "gulp dev",
- "dist": "gulp dist",
+ "dist": "gulp dist --disableLiveReload",
"test": "npm run fastTest && npm run ci && npm run lint",
"fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"",
"watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"",