From 88e11b6ae53e563b00c72b496df09c6efaf28378 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 27 Jan 2019 04:41:01 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 2 ++
 html/changelogs/.all_changelog.yml         | 2 ++
 html/changelogs/AutoChangeLog-pr-10747.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-10748.yml | 4 ----
 4 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-10747.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-10748.yml

diff --git a/html/changelog.html b/html/changelog.html
index 48425aecb41..ec634f3b128 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -63,6 +63,8 @@
 				<li class="bugfix">Fixed item_attack / attack_obj runtime.</li>
 				<li class="bugfix">Fixed runtime when double-clicking a stool in-hand.</li>
 				<li class="bugfix">Antag objectives (kill, debrain, etc) can no longer target people on unreachable zlevels, like the admin-only/centcom zlevel.</li>
+				<li class="bugfix">fixed incorrect definitions of some spells related to shapeshifting.</li>
+				<li class="bugfix">Admin JMP links now work even if you're already following someone/something.</li>
 			</ul>
 			<h3 class="author">Kyep and alonefromhell and Ty Omaha updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index aa052b01a1d..10269302329 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8853,6 +8853,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed runtime when double-clicking a stool in-hand.
   - bugfix: Antag objectives (kill, debrain, etc) can no longer target people on unreachable
       zlevels, like the admin-only/centcom zlevel.
+  - bugfix: fixed incorrect definitions of some spells related to shapeshifting.
+  - bugfix: Admin JMP links now work even if you're already following someone/something.
   Kyep and alonefromhell and Ty Omaha:
   - bugfix: Whispers are now fully readable in admin log.
   datlo:
diff --git a/html/changelogs/AutoChangeLog-pr-10747.yml b/html/changelogs/AutoChangeLog-pr-10747.yml
deleted file mode 100644
index 0c3beda2c88..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10747.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - bugfix: "Admin JMP links now work even if you're already following someone/something."
diff --git a/html/changelogs/AutoChangeLog-pr-10748.yml b/html/changelogs/AutoChangeLog-pr-10748.yml
deleted file mode 100644
index badc0686ee9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10748.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Kyep"
-delete-after: True
-changes: 
-  - bugfix: "fixed incorrect definitions of some spells related to shapeshifting."