aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-10-18 01:52:04 +0800
committerGitHub <noreply@github.com>2016-10-18 01:52:04 +0800
commit101e839f9a254891d9c32a6b4660252506ead04c (patch)
tree8b2194f40165b7bc64a49ad25f18b4cfacb61062
parent6d4c685636dfec384a9b2097250153caac793aea (diff)
parent586404453850b97af66be4375457373ea1d0deed (diff)
downloadtangerine-wallet-browser-101e839f9a254891d9c32a6b4660252506ead04c.tar
tangerine-wallet-browser-101e839f9a254891d9c32a6b4660252506ead04c.tar.gz
tangerine-wallet-browser-101e839f9a254891d9c32a6b4660252506ead04c.tar.bz2
tangerine-wallet-browser-101e839f9a254891d9c32a6b4660252506ead04c.tar.lz
tangerine-wallet-browser-101e839f9a254891d9c32a6b4660252506ead04c.tar.xz
tangerine-wallet-browser-101e839f9a254891d9c32a6b4660252506ead04c.tar.zst
tangerine-wallet-browser-101e839f9a254891d9c32a6b4660252506ead04c.zip
Merge pull request #737 from MetaMask/Version-2.13.4
Version 2.13.4
-rw-r--r--.gitignore1
-rw-r--r--CHANGELOG.md4
-rw-r--r--app/manifest.json2
3 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index fa8a9151f..14b823c82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ notes.txt
app/.DS_Store
development/bundle.js
builds.zip
+test/integration/bundle.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21c501edd..6d88cf70d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,10 @@
## Current Master
+## 2.13.4 2016-10-17
+
+- Add custom transaction fee field to send form.
- Fix bug where web3 was being injected into XML files.
-- Add a custom transaction fee field to send form.
## 2.13.3 2016-10-4
diff --git a/app/manifest.json b/app/manifest.json
index badeb7cb2..cbce01468 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "2.13.3",
+ "version": "2.13.4",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",