From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 8 Nov 2019 22:58:34 +0000 (+0000)
Subject: Merge branch 'master' of https://git.friedersdorff.com/max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=sidebyside;h=df1daf91deb0cfd7bced1de96aac4358455138b1;hp=df1daf91deb0cfd7bced1de96aac4358455138b1;p=max%2Fsaltfiles.git

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