From e55c354a0ef99b7de74358f731034d274d8fa1cb Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 28 May 2019 20:52:01 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.05.28.20.52.01"

---
 html/changelog.html                           |  7 ++++
 html/changelogs/.all_changelog.yml            |  4 ++
 .../changelogs/sunsamsan-thesunchildrises.yml | 42 -------------------
 3 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/sunsamsan-thesunchildrises.yml

diff --git a/html/changelog.html b/html/changelog.html
index 633a02883e4..e7626d2b203 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">28 May 2019</h2>
+			<h3 class="author">SunSamSan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new options for home systems, citizenships, factions, and religions.</li>
+				<li class="rscdel">Removed unused factions.</li>
+			</ul>
+
 			<h2 class="date">25 May 2019</h2>
 			<h3 class="author">PoZe updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 94f89785a6a..9ee2b09439f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8039,3 +8039,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - backend: Disabling(turning it off) turret stops their processing, while enabling
       enables it. Cause no need to process turned off turret, lets save CPU.
   - backend: Turrets Control panel now uses VueUi instead of NanoUi.
+2019-05-28:
+  SunSamSan:
+  - rscadd: Added new options for home systems, citizenships, factions, and religions.
+  - rscdel: Removed unused factions.
diff --git a/html/changelogs/sunsamsan-thesunchildrises.yml b/html/changelogs/sunsamsan-thesunchildrises.yml
deleted file mode 100644
index 9a99bf91fa7..00000000000
--- a/html/changelogs/sunsamsan-thesunchildrises.yml
+++ /dev/null
@@ -1,42 +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
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.  
-author: SunSamSan
-
-# 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: 
-  - rscadd: "Added new options for home systems, citizenships, factions, and religions."
-  - rscdel: "Removed unused factions."