Merge remote-tracking branch 'skeleton/main' into v21.4.28-prep

pombredanne · pombredanne · commit 513d8cc63770 · 2021-04-28T16:06:47.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
 # Ignore all Git auto CR/LF line endings conversions
-* binary
+* -text

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Ignore all Git auto CR/LF line endings conversions`
`2`		`-* binary`
	`2`	`+* -text`