diff options
author | kumavis <aaron@kumavis.me> | 2016-06-29 04:13:06 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2016-06-29 04:13:06 +0800 |
commit | 4777f82ae065bf630c1f1bdc0eb64eacfb4181de (patch) | |
tree | 608d036f502353db83d69ad4500fa0d6cf980f97 /CHANGELOG.md | |
parent | 56087543c807e24ff7d3fd2d7b38050ae4bbb598 (diff) | |
parent | d4708828aa780ad3995ef61d6ec8d5130639751b (diff) | |
download | tangerine-wallet-browser-4777f82ae065bf630c1f1bdc0eb64eacfb4181de.tar.gz tangerine-wallet-browser-4777f82ae065bf630c1f1bdc0eb64eacfb4181de.tar.zst tangerine-wallet-browser-4777f82ae065bf630c1f1bdc0eb64eacfb4181de.zip |
Merge branch 'master' into notif2
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e70ef5e51..aa0eda9ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ - Fixed bug where MetaMask interfered with PDF loading. - Moved switch account icon into menu bar. - Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions. +<<<<<<< HEAD +- Fix formatting on terms & conditions page. +======= +- Now enforce 30 character limit on wallet names. + +>>>>>>> master ## 2.4.4 2016-06-23 |