]> git.friedersdorff.com Git - max/saltfiles.git/commitdiff
projects / max / saltfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdad4a0 128c8dc)
Merge branch 'master' of git.friedersdorff.com:max/saltfiles
authorMaximilian Friedersdorff <max@friedersdorff.com>
Fri, 1 May 2020 19:11:37 +0000 (20:11 +0100)
committerMaximilian Friedersdorff <max@friedersdorff.com>
Fri, 1 May 2020 19:11:37 +0000 (20:11 +0100)
1  2 
states/termite/files/config patch | diff1 | diff2 | blob | history

diff --cc states/termite/files/config
Simple merge
Unnamed repository; edit this file 'description' to name the repository.