From cea6b6d5a91652d2987fe29bcf3c7b572bc209d3 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sun, 21 Jun 2020 07:23:28 +0200
Subject: [PATCH] merge fix

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d6f572b2..1b7bf20a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
 
 - added some protections to the code, coded by atsampson (#380, #381, #382)
 
+- bug fix: server window stop updating after minimized, coded by  AronVietti (#355, #383)
+