From 7c3bdf6c8afdcdf6024a9d1fa281dcbd900f4fcc Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 17 Dec 2021 00:31:03 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 10 ++++++++++
 html/changelogs/.all_changelog.yml         |  5 +++++
 html/changelogs/AutoChangeLog-pr-15429.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-15432.yml |  4 ----
 4 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-15429.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-15432.yml

diff --git a/html/changelog.html b/html/changelog.html
index 78389aedb3..b44a58be3c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 December 2021</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The time for admins to cancel events is 30 seconds again.</li>
+			</ul>
+			<h3 class="author">SandPoot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes assembly holders.</li>
+			</ul>
+
 			<h2 class="date">13 December 2021</h2>
 			<h3 class="author">Putnam3145 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index da28145d2e..0c24ab2b14 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -30398,3 +30398,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-12-13:
   Putnam3145:
   - bugfix: Per-minute science output fixed
+2021-12-17:
+  DeltaFire15:
+  - bugfix: The time for admins to cancel events is 30 seconds again.
+  SandPoot:
+  - bugfix: Fixes assembly holders.
diff --git a/html/changelogs/AutoChangeLog-pr-15429.yml b/html/changelogs/AutoChangeLog-pr-15429.yml
deleted file mode 100644
index 0137994697..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15429.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes: 
-  - bugfix: "The time for admins to cancel events is 30 seconds again."
diff --git a/html/changelogs/AutoChangeLog-pr-15432.yml b/html/changelogs/AutoChangeLog-pr-15432.yml
deleted file mode 100644
index 90cd27d0bb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15432.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SandPoot"
-delete-after: True
-changes: 
-  - bugfix: "Fixes assembly holders."