diff options
author | kumavis <aaron@kumavis.me> | 2016-06-29 04:11:50 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2016-06-29 04:11:50 +0800 |
commit | 57aca116ed33476ce87d9c5f9248013e0b3c5fcc (patch) | |
tree | 2ddf55ec9579b579640509686d60468a84da64ff /CHANGELOG.md | |
parent | 494b62dcf8262e2c9f18e0b59b23129d5b625210 (diff) | |
parent | 2fd03a60fb8c536dbe56c86e1836935616ea14d8 (diff) | |
download | tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.gz tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.zst tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.zip |
Merge branch 'master' into FixSomeFormatting
# Conflicts:
# CHANGELOG.md
# app/scripts/lib/notifications.js
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ee7dc930..aa0eda9ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +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 |