Merge branch 'master' into patch-1

This commit is contained in:
Jordan Brown
2020-08-10 17:48:06 -04:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
<!-- Integration tests will ensure they match across the board -->
<TgsCoreVersion>4.4.4</TgsCoreVersion>
<TgsConfigVersion>2.0.0</TgsConfigVersion>
<TgsApiVersion>7.2.0</TgsApiVersion>
<TgsApiVersion>7.2.1</TgsApiVersion>
<TgsClientVersion>8.2.0</TgsClientVersion>
<TgsDmapiVersion>5.2.3</TgsDmapiVersion>
<TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
+2 -2
View File
@@ -1,4 +1,4 @@
using System;
using System;
using Tgstation.Server.Api.Models.Internal;
namespace Tgstation.Server.Api.Models
@@ -11,7 +11,7 @@ namespace Tgstation.Server.Api.Models
/// <summary>
/// The name of the log file.
/// </summary>
public string? Name { get; set; }
public string Name { get; set; } = String.Empty;
/// <summary>
/// The <see cref="DateTimeOffset"/> of when the log file was modified.