m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-29 15:50:28 +01:00
Code

Merge branch 'master' into FixSvgIcons

Browse Source
This commit is contained in:
Dan Finlay 2016-07-11 20:44:22 -07:00
commit d9718d005c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## Current Master ## Current Master
## 2.6.0 2016-07-11
- Fix formatting of ETH balance - Fix formatting of ETH balance
- Fix formatting of account details. - Fix formatting of account details.
- Use web3 minified dist for faster inject times - Use web3 minified dist for faster inject times

2
app/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "__MSG_appName__", "name": "__MSG_appName__",
"short_name": "Metamask", "short_name": "Metamask",
"version": "2.5.0", "version": "2.6.0",
"manifest_version": 2, "manifest_version": 2,
"description": "__MSG_appDescription__", "description": "__MSG_appDescription__",
"icons": { "icons": {