From b0befae1892a71aed680a3f01698c834a8efad44 Mon Sep 17 00:00:00 2001
From: FloofStation Changelogs
 <175611579+Floof-Station-Bot@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:44:22 +0000
Subject: [PATCH] Automatic Changelog Update (#190)

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

diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
index 757d4beaff..aa1cdafc04 100644
--- a/Resources/Changelog/Floof.yml
+++ b/Resources/Changelog/Floof.yml
@@ -1003,3 +1003,10 @@ Entries:
   id: 135
   time: '2024-09-23T02:26:14.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/199
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: Upstream merge. See the Einstein-Engines tab for more details.
+  id: 136
+  time: '2024-09-23T17:43:54.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/190