]> Frank Brehm's Git Trees - salt/pillar.git/commitdiff
projects / salt / pillar.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 599d468 b05fe10)
Merge branch 'master' of ssh://git.uhu-banane.de/var/lib/git/salt/pillar
authorFrank Brehm <frank@brehm-online.com>
Tue, 6 Apr 2021 07:05:00 +0000 (09:05 +0200)
committerFrank Brehm <frank@brehm-online.com>
Tue, 6 Apr 2021 07:05:00 +0000 (09:05 +0200)
1  2 
top.sls patch | diff1 | diff2 | blob | history

diff --cc top.sls
Simple merge
Unnamed repository; edit this file 'description' to name the repository.