From 36cf5c1d7601a642ff1e396c9cd5c739f26cc812 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Fri, 11 Nov 2022 17:24:04 +0100
Subject: [PATCH] Merge new changes and update changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b2fe932..33ab1d95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,8 +71,9 @@ opened, a request to update the file format will show up.
 * The data access methods for the custom config file parser have been improved to better report
   correct type information. PR #1197.
 * Saving and loading of XML data is now handled by a separate set of reader and writer classes. The
-  reader class is capable of reading all file formats that have been used thus far. Issue #1189.
-  PR #1221.
+  reader class is capable of reading all file formats that have been used thus far. The various
+  data classes have been improved, and a new XML file formart version 1.5 added. Issue #1189.
+  PRs #1221 and #1232.
 * The project folder on disk is now wrapped in a storage class that the project accesses files
   through. It also handles lock files and archiving used for backup. The change is in preparation
   for adding a potential single file format. Issue #1222. PR #1225.