aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-06-29 04:12:15 +0800
committerGitHub <noreply@github.com>2016-06-29 04:12:15 +0800
commitd4708828aa780ad3995ef61d6ec8d5130639751b (patch)
tree2ddf55ec9579b579640509686d60468a84da64ff /CHANGELOG.md
parent2fd03a60fb8c536dbe56c86e1836935616ea14d8 (diff)
parent57aca116ed33476ce87d9c5f9248013e0b3c5fcc (diff)
downloadtangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar
tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.gz
tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.bz2
tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.lz
tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.xz
tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.zst
tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.zip
Merge pull request #345 from MetaMask/FixSomeFormatting
Fix some formatting
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25a5fedb3..aa0eda9ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +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