From be6735f4d9fd2138bb78110779bbff13ab9f6fa3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 28 Aug 2021 11:22:15 +0200
Subject: Merging upstream version 20210828.

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

(limited to 'CHANGELOG.txt')

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 49e734d..8fe2fd7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,14 @@
-2019-03-02	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+2021-08-28	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
-	* Releasing version 20190301-lts1.
+	* Releasing version 20210821.
+
+	[ Daniel Baumann ]
+	* Moving apache files to subdirectory.
+	* Using rst instead of asciidoc for manpage generation.
+	* Adding dehydrated tools.
+	* Adding git tools.
+	* Adding irker tools.
+	* Adding knot-resolver tools.
 
 2019-03-01	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
-- 
cgit v1.2.3