From 7071305d04525bfa13e6a406e951a32ba2ebfec7 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Mon, 17 Apr 2017 23:29:59 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 4 ++++
 html/changelogs/.all_changelog.yml        | 2 ++
 html/changelogs/AutoChangeLog-pr-7119.yml | 4 ----
 3 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7119.yml

diff --git a/html/changelog.html b/html/changelog.html
index e40e86ff4f7..78dc88b2663 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,10 @@
 				<li class="bugfix">The God-emperor of Mankind diskette's UI works again.</li>
 				<li class="bugfix">DNA UI injectors will now immediately update a person's eye colour.</li>
 			</ul>
+			<h3 class="author">Krausus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">You can no longer squeeze non-match objects into matchboxes.</li>
+			</ul>
 
 			<h2 class="date">16 April 2017</h2>
 			<h3 class="author">FalseIncarnate updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 09188a889ae..fb43a2618a2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4491,3 +4491,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   KasparoVy:
   - bugfix: The God-emperor of Mankind diskette's UI works again.
   - bugfix: DNA UI injectors will now immediately update a person's eye colour.
+  Krausus:
+  - bugfix: You can no longer squeeze non-match objects into matchboxes.
diff --git a/html/changelogs/AutoChangeLog-pr-7119.yml b/html/changelogs/AutoChangeLog-pr-7119.yml
deleted file mode 100644
index a7fe4c671a9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7119.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Krausus"
-delete-after: True
-changes: 
-  - bugfix: "You can no longer squeeze non-match objects into matchboxes."