From f4ee72a88d9ef783343d8dc5f94fd3a791b040b8 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Fri, 6 Apr 2018 19:07:11 +0300
Subject: [PATCH] Changelogs, 06APR2018

---
 html/changelog.html                |  7 ++++++
 html/changelogs/.all_changelog.yml |  5 ++++
 html/changelogs/Ron-UplinkFix.yml  | 38 ------------------------------
 3 files changed, 12 insertions(+), 38 deletions(-)
 delete mode 100644 html/changelogs/Ron-UplinkFix.yml

diff --git a/html/changelog.html b/html/changelog.html
index dbd633ecd34..44563489211 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">06 April 2018</h2>
+			<h3 class="author">Printer16 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ninja uplinks and merc uplinks now work properly. Check your tabs for items that were previously unavailable due to the bug.</li>
+				<li class="bugfix">Traitors can no longer see categories they don't have access to.</li>
+			</ul>
+
 			<h2 class="date">31 March 2018</h2>
 			<h3 class="author">TheGreatNacho updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0ab5c59973e..23fe211b74d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5256,3 +5256,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed lighter being deleted when pulling a cigarette out of it's packet
       with your mouth.
   - bugfix: Fixed spears losing their material after mounting head to them.
+2018-04-06:
+  Printer16:
+  - bugfix: Ninja uplinks and merc uplinks now work properly. Check your tabs for
+      items that were previously unavailable due to the bug.
+  - bugfix: Traitors can no longer see categories they don't have access to.
diff --git a/html/changelogs/Ron-UplinkFix.yml b/html/changelogs/Ron-UplinkFix.yml
deleted file mode 100644
index ee005f8e6cd..00000000000
--- a/html/changelogs/Ron-UplinkFix.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#################################
-
-# Your name.  
-author: Printer16
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Ninja uplinks and merc uplinks now work properly. Check your tabs for items that were previously unavailable due to the bug."
-  - bugfix: "Traitors can no longer see categories they don't have access to."