Merge remote-tracking branch 'upstream/master' into wounds-part-2

2020-07-25 02:03:01 +01:00
parent 697301ad53 571beb24b0
commit c4a1019059
4 changed files with 11 additions and 9 deletions
@@ -50,6 +50,16 @@
 		-->
 		<div class="commit sansserif">

+			<h2 class="date">25 July 2020</h2>
+			<h3 class="author">CameronWoof updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Aloe now has an icon.</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">beepsky replaces the word THREAT_LEVEL with the actual threat level</li>
+			</ul>
+
 			<h2 class="date">24 July 2020</h2>
 			<h3 class="author">EmeraldSundisk updated:</h3>
 			<ul class="changes bgimages16">
@@ -26517,4 +26517,4 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
  CameronWoof:
  - bugfix: Aloe now has an icon.
  timothyteakettle:
-  - bugfix: beepsky replaces the word THREAT_LEVEL with the actual threat level
+  - bugfix: beepsky replaces the word THREAT_LEVEL with the actual threat level
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - bugfix: "beepsky replaces the word THREAT_LEVEL with the actual threat level"
@@ -1,4 +0,0 @@
-author: "CameronWoof"
-delete-after: True
-changes: 
-  - bugfix: "Aloe now has an icon."