Merge remote-tracking branch 'origin/laptop'

2023-04-18 23:07:40 +02:00
parent fd24855d13 a1548725d6
commit 229e863562
10 changed files with 341 additions and 13 deletions
@@ -11,4 +11,6 @@
 	attributesfile = ~/.gitattributes
 [filter "zippey"]
 	smudge = ~/zippey/zippey.py d
-	clean = ~/zippey/zippey.py e
+	clean = ~/zippey/zippey.py e
+[init]
+	defaultBranch = main