Merge branch 'master' into patch-21

quicwg · Oct 19, 2018 · 595680a · 595680a
2 parents ccbaf4c + 127130c
commit 595680a
Show file tree

Hide file tree

Showing 5 changed files with 4,546 additions and 4,204 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,11 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.md text
+*.xml text
+
+# Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf
+*.mk txt eol=lf