From dffb85dc2a39c3af7bac930c8b36bcd285cafeef Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 30 Jul 2020 10:35:55 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.30.10.35.54"

---
 html/changelog.html                          |  6 +++
 html/changelogs/.all_changelog.yml           |  9 ++++
 html/changelogs/Aboshehab - Nation Logos.yml | 43 --------------------
 3 files changed, 15 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/Aboshehab - Nation Logos.yml

diff --git a/html/changelog.html b/html/changelog.html
index 898671ffb03..2deeac62398 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,12 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">30 July 2020</h2>
+			<h3 class="author">Aboshehab updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Entering [logo_zavod] will now place the zavod logo when written on a paper.</li>
+				<li class="tweak">Changed the prefix of nation flags from [logo_x] to [flag_x] to place a divide between the entities.</li>
+				<li class="rscadd">Added or changed a number of flags that can be placed on paper for nations. [flag_be] for Biesel, [flag_sol] for Sol, [flag_elyra] for Elyra, [flag_coc] for the Coalition, [flag_dom] for Dominia, [flag_jargon] for Jargon, [flag_pra] for PRA, [flag_dpra] for DPRA, [flag_nka] for NKA and [flag_izweski] for Hegemony.</li>
+			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">IPCs made by robotics now start with EAL.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a3c392aea96..890596c555a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14503,6 +14503,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       crew.
   - rscadd: The matter decompiler will now decompile empty drinks cans.
 2020-07-30:
+  Aboshehab:
+  - bugfix: Entering [logo_zavod] will now place the zavod logo when written on a
+      paper.
+  - tweak: Changed the prefix of nation flags from [logo_x] to [flag_x] to place a
+      divide between the entities.
+  - rscadd: Added or changed a number of flags that can be placed on paper for nations.
+      [flag_be] for Biesel, [flag_sol] for Sol, [flag_elyra] for Elyra, [flag_coc]
+      for the Coalition, [flag_dom] for Dominia, [flag_jargon] for Jargon, [flag_pra]
+      for PRA, [flag_dpra] for DPRA, [flag_nka] for NKA and [flag_izweski] for Hegemony.
   Geeves:
   - bugfix: IPCs made by robotics now start with EAL.
   - bugfix: Making cable restraints no longer brings up a menu of people to do it
diff --git a/html/changelogs/Aboshehab - Nation Logos.yml b/html/changelogs/Aboshehab - Nation Logos.yml
deleted file mode 100644
index 9da88148a4c..00000000000
--- a/html/changelogs/Aboshehab - Nation Logos.yml	
+++ /dev/null
@@ -1,43 +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: Aboshehab
-
-# 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: "Entering [logo_zavod] will now place the zavod logo when written on a paper."
-  - tweak: "Changed the prefix of nation flags from [logo_x] to [flag_x] to place a divide between the entities."
-  - rscadd: "Added or changed a number of flags that can be placed on paper for nations. [flag_be] for Biesel, [flag_sol] for Sol, [flag_elyra] for Elyra, [flag_coc] for the Coalition, [flag_dom] for Dominia, [flag_jargon] for Jargon, [flag_pra] for PRA, [flag_dpra] for DPRA, [flag_nka] for NKA and [flag_izweski] for Hegemony."