Merge branch 'master' into develop

cosmos · Apr 9, 2018 · 8e4d6a5 · 8e4d6a5
2 parents 4807a19 + 72bebc6
commit 8e4d6a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.14.0 (TBD)
+## 0.14.0 (April 9, 2018)
 
 BREAKING CHANGES:
 
@@ -13,6 +13,10 @@ BREAKING CHANGES:
   `basecoind/basecli` and `democoind/democli`
 * [staking] Various fixes/improvements
 
+FEATURES:
+
+* [democoin] Added Proof-of-Work module
+
 BUG FIXES
 
 * [client] Reuse Tendermint RPC client to avoid excessive open files

diff --git a/version/version.go b/version/version.go
@@ -9,7 +9,7 @@ const Maj = "0"
 const Min = "14"
 const Fix = "0"
 
-const Version = "0.14.0-dev"
+const Version = "0.14.0"
 
 // GitCommit set by build flags
 var GitCommit = ""