Merge branch 'master' into display_network

1 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97843cf58..784c49cf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,15 @@
 
 ## Current Master
 
-- show network conection in title bar
+- show network status in title bar
+- Added seed word recovery to config screen.
+
+## 2.2.0 2016-06-02
+
 - Redesigned init, vault create, vault restore and seed confirmation screens.
 - Added pending transactions to transaction list on account screen.
 - Clicking a pending transaction takes you back to the transaction approval screen.
+- Update provider-engine to fix intermittent out of gas errors.
 
 ## 2.1.0 2016-05-26