From: Jon Trulson <jon@radscan.com>
Date: Sat, 16 Nov 2019 23:34:48 +0000 (-0700)
Subject: Merge branch 'master' into utf8-conversion after 2.3.1 release
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fcde.git;a=commitdiff_plain;h=ba68ff0a179ca82194783b75ae0807c4065ce28a

Merge branch 'master' into utf8-conversion after 2.3.1 release
---

ba68ff0a179ca82194783b75ae0807c4065ce28a