]> git.immae.eu Git - github/bastienwirtz/homer.git/commitdiff
Merge remote-tracking branch 'upstream/master' into feature/custom-card-colors
authorTom Pansino <2768420+tpansino@users.noreply.github.com>
Wed, 2 Sep 2020 06:47:59 +0000 (23:47 -0700)
committerTom Pansino <2768420+tpansino@users.noreply.github.com>
Wed, 2 Sep 2020 06:47:59 +0000 (23:47 -0700)
1  2 
docs/configuration.md

Simple merge