Merge branch '2.4.x' into 2.5.x

See gh-28473
4 years ago · 282e8ecc1a
1 changed files with 0 additions and 11 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,11 +0,0 @@
				@@ -1,11 +0,0 @@
-* text eol=lf
-
-*.groovy        text diff=java
-*.java          text diff=java
-*.kt            text diff=java
-
-*.bat           text eol=crlf
-
-*.gif           binary
-*.jar           binary
-*.jpg           binary