From 06de942f6f1436c5178b4f0b6fd236b97598e919 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sat, 25 Mar 2017 02:27:52 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 8704f0a9e48..aa9fabdd1e3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">25 March 2017</h2>
+			<h3 class="author">Kyep updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Pipes in the Wizard Academy have been banished back under the carpet, where they belong.</li>
+			</ul>
+
 			<h2 class="date">24 March 2017</h2>
 			<h3 class="author">KasparoVy updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8138849f0fb..06d2b0564ca 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4260,3 +4260,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: IV Drips are no longer dense objects, you can walk over them.
   - rscadd: You can change gold and silver tiles into fancy versions by using them
       in hand.
+2017-03-25:
+  Kyep:
+  - bugfix: Pipes in the Wizard Academy have been banished back under the carpet,
+      where they belong.
diff --git a/html/changelogs/AutoChangeLog-pr-6905.yml b/html/changelogs/AutoChangeLog-pr-6905.yml
deleted file mode 100644
index f3f68188d2a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-6905.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - bugfix: "Pipes in the Wizard Academy have been banished back under the carpet, where they belong."