From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 9 Sep 2020 14:06:16 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/saltfiles into master
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=3f84d93e1dedb6281042e463023e091f5f0e4450;hp=3f84d93e1dedb6281042e463023e091f5f0e4450;p=max%2Fsaltfiles.git

Merge branch 'master' of git.friedersdorff.com:max/saltfiles into master
---