From 0a0fe09e9b144e96d4c6b7f1dab937f49de58f08 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 22 Jan 2018 21:59:27 +0100
Subject: fix #5262

---
 ChangeLog | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 5b0dfa33..b3c2c461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Mon Jan 22 21:54:42 CET 2018
+	Address #5262. -CG
+
+Tue Jan 2 00:27:29 2018
+	Implement #5158 (proper handling of aborted payments). -CG
+
+Wed Dec 27 11:21:43 2017
+	Complete logic to allow /pay to span coins from multiple exchanges. -CG
+
+Wed Dec 13 21:50:59 2017
+	Use new wire transfer logic in payments generator. -CG
+
+Thu Dec 7 07:42:40 2017
+	Implemented new tipping feature (now with private keys in files). -CG
+
 Wed Oct 18 15:33:23 CEST 2017
 	Releasing taler-merchant 0.4.0. -CG
 
-- 
cgit v1.2.3