From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 19 Sep 2019 06:21:43 +0000 (+0100)
Subject: Merge branch 'master' of https://git.friedersdorff.com/max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=ec29f230f76084eec585d84a88ae5f8c7bc07d04;hp=ec29f230f76084eec585d84a88ae5f8c7bc07d04;p=max%2Fsaltfiles.git

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