Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug

1 files changed, 6 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72866a75c..3805b1c2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Current Master
 
+- Fix rendering of recipient SVG in tx approval notification.
+
+## 2.6.0 2016-07-11
+
 - Fix formatting of ETH balance
 - Fix formatting of account details.
 - Use web3 minified dist for faster inject times
@@ -9,6 +13,8 @@
 - Update transaction approval styles.
 - Align failed and successful transaction history text.
 - Fix issue where large domain names and large transaction values would misalign the transaction history.
+- Abbreviate ether balances on transaction details to maintain formatting.
+- General code cleanup.
 
 ## 2.5.0 2016-06-29