From a6d7729142b055da4bcd3fcff307c8f677739211 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 5 Jan 2022 08:06:49 +0100
Subject: Merging upstream version 20220105.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CHANGELOG.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CHANGELOG.txt')

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 97096a2..954d841 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2022-01-05	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20220105.
+
+	[ Daniel Baumann ]
+	* Updating copyright notices for 2022.
+	* Temporarily reverting json support in dehydrated-nsupdate, not ready just yet.
+
 2021-12-31	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20211231.
-- 
cgit v1.2.3