From 17c8af2a9d553ab1fe5fa8e39f7f1d747b5d60a2 Mon Sep 17 00:00:00 2001
From: DeltaV-Bot <135767721+DeltaV-Bot@users.noreply.github.com>
Date: Sun, 17 Mar 2024 17:10:04 +0000
Subject: [PATCH] Automatic changelog update

---
 Resources/Changelog/DeltaVChangelog.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index ffb8596fecf..e1327f5d032 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1829,3 +1829,10 @@
   id: 280
   time: '2024-03-17T13:38:11.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/949
+- author: DebugOk
+  changes:
+  - message: Merged upstream, please report any bugs or regressions
+    type: Add
+  id: 281
+  time: '2024-03-17T17:09:43.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/973