From fb3ed1c62d90e707c9faae45e178496376ada3f6 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Wed, 11 Nov 2015 00:32:05 +0000
Subject: [PATCH] Automatic changelog compile

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

diff --git a/html/changelog.html b/html/changelog.html
index d522585f5cb..cd5c9cfc667 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">11 November 2015</h2>
+			<h3 class="author">MrStonedOne updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes the smartfridge not stacking items.</li>
+			</ul>
+
 			<h2 class="date">08 November 2015</h2>
 			<h3 class="author">Cuboos updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6b1ebed8f96..c3b7da9d826 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2321,3 +2321,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Shadowling clothing now has icons to better reflect its existence.
   - rscdel: Ascendant Broadcast has been removed.
   - rscdel: Destroy Engines is now removed from the user after it is used once.
+2015-11-11:
+  MrStonedOne:
+  - bugfix: Fixes the smartfridge not stacking items.
diff --git a/html/changelogs/AutoChangeLog-pr-12944.yml b/html/changelogs/AutoChangeLog-pr-12944.yml
deleted file mode 100644
index eb20ed2780b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-12944.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: MrStonedOne
-delete-after: True
-changes: 
-  - bugfix: "Fixes the smartfridge not stacking items."