From 4444e946fc3ab41e6f193f40fed0912ef5d63d82 Mon Sep 17 00:00:00 2001
From: Grimbly Changelogs <flyingkarii@users.noreply.github.com>
Date: Sun, 15 Dec 2024 18:37:20 +0000
Subject: [PATCH] Automatic changelog update (#142)

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

diff --git a/Resources/Changelog/GrimblyChangelog.yml b/Resources/Changelog/GrimblyChangelog.yml
index bef6a57d1d..2830d7e8f8 100644
--- a/Resources/Changelog/GrimblyChangelog.yml
+++ b/Resources/Changelog/GrimblyChangelog.yml
@@ -20,3 +20,10 @@ Entries:
   id: 3
   time: '2024-12-08T21:19:19.0000000+00:00'
   url: https://github.com/Grimbly-Station/Grimbly-Station/pull/141
+- author: zelezniciar
+  changes:
+    - type: Add
+      message: Merged upstream up to December 15th 2024
+  id: 4
+  time: '2024-12-15T18:36:54.0000000+00:00'
+  url: https://github.com/Grimbly-Station/Grimbly-Station/pull/142