aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-11-16 05:39:42 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-11-16 05:41:09 +0800
commit14e6b92e2933c570b2436d13ae3ebba7cfffc0e0 (patch)
tree52a1e9fef97105f8b02ff804043ef29279506781 /CHANGELOG.md
parent1db0bc4b2aa3297e2a621ad3a4378cb940fb90c3 (diff)
parent68d5b459ed406fd8d5e460e3208250530b21aa43 (diff)
downloadtangerine-wallet-browser-14e6b92e2933c570b2436d13ae3ebba7cfffc0e0.tar.gz
tangerine-wallet-browser-14e6b92e2933c570b2436d13ae3ebba7cfffc0e0.tar.zst
tangerine-wallet-browser-14e6b92e2933c570b2436d13ae3ebba7cfffc0e0.zip
Resolve merge conflicts.
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7da7df7b..970ebde80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## Current Master
- Show a warning when a transaction fails during simulation.
- Fix bug where 20% of gas estimate was not being added properly.
+- Render error messages in our confirmation screen more gracefully.
## 2.13.7 2016-11-8