From 45e8b59e0c3bc3ee28ec7eeb3e8339e3e29921b8 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 23 May 2017 18:49:33 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 7 +++++++
 html/changelogs/.all_changelog.yml        | 4 ++++
 html/changelogs/AutoChangeLog-pr-7322.yml | 5 -----
 3 files changed, 11 insertions(+), 5 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7322.yml

diff --git a/html/changelog.html b/html/changelog.html
index 9620ad55297..a9fa07f91c5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">23 May 2017</h2>
+			<h3 class="author">Fethas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Lockets and necklaces to the loadout. Lockets can hold paper and photos</li>
+				<li class="rscadd">Fethas fluff item</li>
+			</ul>
+
 			<h2 class="date">22 May 2017</h2>
 			<h3 class="author">DarkPyrolord updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b929c2faae9..36d660cf283 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4736,3 +4736,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Adds mech-mounted variants of the existing tesla, immolator, and x-ray
       laser guns, with the same material and tech requirements. Admin-only Seraph
       mech also gets better weapons.
+2017-05-23:
+  Fethas:
+  - rscadd: Lockets and necklaces to the loadout. Lockets can hold paper and photos
+  - rscadd: Fethas fluff item
diff --git a/html/changelogs/AutoChangeLog-pr-7322.yml b/html/changelogs/AutoChangeLog-pr-7322.yml
deleted file mode 100644
index e139a6330d9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7322.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Fethas"
-delete-after: True
-changes: 
-  - rscadd: "Lockets and necklaces to the loadout. Lockets can hold paper and photos"
-  - rscadd: "Fethas fluff item"