From bbccb14d1be52a3375b44da7c68323c30c0ce985 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Sat, 25 Apr 2015 06:38:46 +0200
Subject: Ready for plop-0.7.0.

---
 NEWS.md       | 11 ++++++++++-
 ebin/plop.app |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index e1408b5..e93e9ff 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,13 @@
-# Changes in plop 0.7.0-dev
+# Changes in plop 0.7.0 - 2015-04-25
+
+## Features
+
+- Support for reading an HSM PIN from a file added.
+
+## Bugfixes
+
+- Fix a bug where duplicated entries were not accepted by frontend
+  nodes, f.ex. at merge (CATLFISH-44).
 
 # Changes in plop 0.6.0 - 2015-04-13
 
diff --git a/ebin/plop.app b/ebin/plop.app
index abf81fd..56a1b56 100644
--- a/ebin/plop.app
+++ b/ebin/plop.app
@@ -5,7 +5,7 @@
 
 {application, plop,
  [{description, "The plop store"},
-  {vsn, "0.7.0-dev"},
+  {vsn, "0.7.0"},
   {modules, [plop_app, plop_sup, plop, db, ht, hex]},
   {applications, [kernel, stdlib]},     % crypto, public_key
   {registered, [plop, ht, db]},
-- 
cgit v1.1