From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 22 May 2020 13:05:16 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=inline;h=9e27f2ec9b84df5f67d79e37ea974b727a1f599a;p=max%2Fsaltfiles.git

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

9e27f2ec9b84df5f67d79e37ea974b727a1f599a