From ecd3e33f3b79fb0ba56cb1775ecfd34117793bf7 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 4 Jul 2020 12:15:49 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.04.12.15.49"

---
 html/changelog.html                        |  6 ++++
 html/changelogs/.all_changelog.yml         |  3 ++
 html/changelogs/mattatlas-emotedeclfix.yml | 41 ----------------------
 3 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-emotedeclfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 908fccab312..5c03036cc32 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">04 July 2020</h2>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">You can now use ^ in the middle of an emote to put your name there.</li>
+			</ul>
+
 			<h2 class="date">03 July 2020</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c334d6d32e0..e7d474e6987 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13988,3 +13988,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscdel: Removed the old lobby background which was left in by accident.
   Yonnimer:
   - tweak: Changes the gimlet recipe to 1 gin, 1 limejuice, 1 grenadine.
+2020-07-04:
+  MattAtlas:
+  - bugfix: You can now use ^ in the middle of an emote to put your name there.
diff --git a/html/changelogs/mattatlas-emotedeclfix.yml b/html/changelogs/mattatlas-emotedeclfix.yml
deleted file mode 100644
index 8fc93193dc9..00000000000
--- a/html/changelogs/mattatlas-emotedeclfix.yml
+++ /dev/null
@@ -1,41 +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: MattAtlas
-
-# 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: "You can now use ^ in the middle of an emote to put your name there."