]> git.friedersdorff.com Git - max/saltfiles.git/commitdiff
projects / max / saltfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b19e188 b88e9af)
Merge branch 'master' of git.friedersdorff.com:max/saltfiles into master
authorMaximilian Friedersdorff <max@friedersdorff.com>
Wed, 9 Sep 2020 14:06:16 +0000 (15:06 +0100)
committerMaximilian Friedersdorff <max@friedersdorff.com>
Wed, 9 Sep 2020 14:06:16 +0000 (15:06 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.