From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 1 May 2020 19:11:37 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=bf087cba3236f1487a345cdd9c2b94f05a283208;p=max%2Fsaltfiles.git

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

bf087cba3236f1487a345cdd9c2b94f05a283208