From 373b7bb39ea8398d32a282d182f338b138f4ddec Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Tue, 3 Apr 2018 11:24:23 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index afc1ca466e4..e9a1d441a6d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">03 April 2018</h2>
+			<h3 class="author">YPOQ updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Mannitol will now properly cure minor brain traumas</li>
+			</ul>
+			<h3 class="author">robbylm updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes 0 value not being saved in constant memory circuits (#36860)</li>
+			</ul>
+
 			<h2 class="date">02 April 2018</h2>
 			<h3 class="author">Davidj361 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 213f0338e78..3dac01bfc0e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17129,3 +17129,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       collection clean them up.
   RandomMarine:
   - bugfix: The quick equip hotkey (e) now works for drones again.
+2018-04-03:
+  YPOQ:
+  - bugfix: Mannitol will now properly cure minor brain traumas
+  robbylm:
+  - bugfix: Fixes 0 value not being saved in constant memory circuits (#36860)
diff --git a/html/changelogs/AutoChangeLog-pr-36645.yml b/html/changelogs/AutoChangeLog-pr-36645.yml
deleted file mode 100644
index 31b8844e026..00000000000
--- a/html/changelogs/AutoChangeLog-pr-36645.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "YPOQ"
-delete-after: True
-changes: 
-  - bugfix: "Mannitol will now properly cure minor brain traumas"
diff --git a/html/changelogs/AutoChangeLog-pr-36867.yml b/html/changelogs/AutoChangeLog-pr-36867.yml
deleted file mode 100644
index ca2dfb334b5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-36867.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "robbylm"
-delete-after: True
-changes: 
-  - bugfix: "Fixes 0 value not being saved in constant memory circuits (#36860)"