]> git.friedersdorff.com Git - max/saltfiles.git/commitdiff
projects / max / saltfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d11938e f0f536b)
Merge branch 'master' of git.friedersdorff.com:max/saltfiles
authorMaximilian Friedersdorff <max@friedersdorff.com>
Sun, 17 Nov 2019 22:10:48 +0000 (22:10 +0000)
committerMaximilian Friedersdorff <max@friedersdorff.com>
Sun, 17 Nov 2019 22:10:48 +0000 (22:10 +0000)
1  2 
states/sway/files/config.jinja patch | diff1 | diff2 | blob | history

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