From 571beb24b0726163c22b90115eaa8f2bb658e82d Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sat, 25 Jul 2020 00:11:03 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 9145e2a7ff..8f0f7a5952 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">25 July 2020</h2>
+			<h3 class="author">CameronWoof updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Aloe now has an icon.</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">beepsky replaces the word THREAT_LEVEL with the actual threat level</li>
+			</ul>
+
 			<h2 class="date">24 July 2020</h2>
 			<h3 class="author">EmeraldSundisk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6e4efc1963..c433ea1a19 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26513,3 +26513,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: beepsky can now wear hats
   zeroisthebiggay:
   - imageadd: rad and kravglove sprites
+2020-07-25:
+  CameronWoof:
+  - bugfix: Aloe now has an icon.
+  timothyteakettle:
+  - bugfix: beepsky replaces the word THREAT_LEVEL with the actual threat level
diff --git a/html/changelogs/AutoChangeLog-pr-12879.yml b/html/changelogs/AutoChangeLog-pr-12879.yml
deleted file mode 100644
index 84487bfc3f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12879.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - bugfix: "beepsky replaces the word THREAT_LEVEL with the actual threat level"
diff --git a/html/changelogs/AutoChangeLog-pr-12880.yml b/html/changelogs/AutoChangeLog-pr-12880.yml
deleted file mode 100644
index 4f961392e1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12880.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "CameronWoof"
-delete-after: True
-changes: 
-  - bugfix: "Aloe now has an icon."