From: Tom Pansino <2768420+tpansino@users.noreply.github.com>
Date: Wed, 2 Sep 2020 06:47:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into feature/custom-card-colors
X-Git-Tag: v20.09.1~2^2~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=fbe9338fd3a78141110530055c9b90a5958f845f;p=github%2Fbastienwirtz%2Fhomer.git

Merge remote-tracking branch 'upstream/master' into feature/custom-card-colors
---

fbe9338fd3a78141110530055c9b90a5958f845f