From 2688a61c69aad16def5ed6ef301ff49a70fd55eb Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Mon, 15 May 2017 03:16:00 -0400
Subject: [PATCH] Automatic changelog compile, [ci skip]

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

diff --git a/html/changelog.html b/html/changelog.html
index 712e4ca74f1..0ccd2de953d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">15 May 2017</h2>
+			<h3 class="author">TullyBurnalot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Disposal Bin Light now works with thrown items</li>
+				<li class="bugfix">Fixes typos with cowboy items</li>
+			</ul>
+
 			<h2 class="date">13 May 2017</h2>
 			<h3 class="author">Fethas updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 443e8d8a377..58929afe162 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4663,3 +4663,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: runed metal can now be only used on cult girders.
   KasparoVy:
   - bugfix: Fixes a sprite issue with the Unathi Dorsal Frill's webbing.
+2017-05-15:
+  TullyBurnalot:
+  - bugfix: Disposal Bin Light now works with thrown items
+  - bugfix: Fixes typos with cowboy items
diff --git a/html/changelogs/AutoChangeLog-pr-7308.yml b/html/changelogs/AutoChangeLog-pr-7308.yml
deleted file mode 100644
index 5841364e454..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7308.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TullyBurnalot"
-delete-after: True
-changes: 
-  - bugfix: "Disposal Bin Light now works with thrown items"
diff --git a/html/changelogs/AutoChangeLog-pr-7309.yml b/html/changelogs/AutoChangeLog-pr-7309.yml
deleted file mode 100644
index 2e510632486..00000000000
--- a/html/changelogs/AutoChangeLog-pr-7309.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TullyBurnalot"
-delete-after: True
-changes: 
-  - bugfix: "Fixes typos with cowboy items"