From 8756ee6f6869a5bfaf89eeed6f647a04211ae724 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Tue, 25 Jul 2017 21:05:57 +0300
Subject: [PATCH] Changelogs, 25JUL2017

---
 html/changelog.html                               | 8 ++++++++
 html/changelogs/.all_changelog.yml                | 6 ++++++
 html/changelogs/moondancerpony-coffee-7-24-17.yml | 8 --------
 3 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/moondancerpony-coffee-7-24-17.yml

diff --git a/html/changelog.html b/html/changelog.html
index c2ef8e194dc..2c72896e820 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,14 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">25 July 2017</h2>
+			<h3 class="author">MoondancerPony updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a recipe for Cafe Melange, black coffee and cream.</li>
+				<li class="rscadd">Cargo can now order premium coffee beans and Morning Glory Coffee Mates. This addition sponsored by Morning Glory Coffee.</li>
+				<li class="bugfix">The recipe for Cafe Au Lait actually works now.</li>
+			</ul>
+
 			<h2 class="date">24 July 2017</h2>
 			<h3 class="author">Lohikar updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 498a317e646..85b8cb6e82d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4482,3 +4482,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-07-24:
   Lohikar:
   - bugfix: Ghosts are no longer sideways.
+2017-07-25:
+  MoondancerPony:
+  - rscadd: Added a recipe for Cafe Melange, black coffee and cream.
+  - rscadd: Cargo can now order premium coffee beans and Morning Glory Coffee Mates.
+      This addition sponsored by Morning Glory Coffee.
+  - bugfix: The recipe for Cafe Au Lait actually works now.
diff --git a/html/changelogs/moondancerpony-coffee-7-24-17.yml b/html/changelogs/moondancerpony-coffee-7-24-17.yml
deleted file mode 100644
index 6f7910f9811..00000000000
--- a/html/changelogs/moondancerpony-coffee-7-24-17.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: MoondancerPony
-
-delete-after: True
-
-changes: 
-  - rscadd: "Added a recipe for Cafe Melange, black coffee and cream."
-  - rscadd: "Cargo can now order premium coffee beans and Morning Glory Coffee Mates. This addition sponsored by Morning Glory Coffee."
-  - bugfix: "The recipe for Cafe Au Lait actually works now."