Merge branch 'master' into freosc

# Conflicts:
#	ElectronNET.Host/main.js
This commit is contained in:
Fre
2020-08-21 11:13:06 +02:00
17 changed files with 130 additions and 74 deletions

View File

@@ -142,7 +142,7 @@ namespace ElectronNET.API.Entities
/// <summary>
/// Defaults to 16.
/// </summary>
public int DefaultFontSize { get; set; }
public int DefaultFontSize { get; set; } = 16;
/// <summary>
/// Defaults to 13.