From: Ben Beltran <redacted>
Date: Mon, 9 Mar 2020 19:17:23 +0000 (-0500)
Subject: Merge branch 'hotfix/3.0.2'
X-Git-Tag: 3.0.2^0
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/0175290596f12226a69cda815ad1c73b0f43d898?ds=sidebyside;hp=0175290596f12226a69cda815ad1c73b0f43d898

Merge branch 'hotfix/3.0.2'
---