Merge remote-tracking branch 'upstream/pull/3313'

diff --git a/.editorconfig b/.editorconfig
new file mode 100644 (file)
index 0000000..44b3832
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..5be0fcd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,17 @@
+# text=auto is only correctly supported in git 2.10.0
+#  https://github.com/git/git/blob/master/Documentation/RelNotes/2.10.0.txt#L248
+# * text=auto eol=lf
+*.sh text eol=lf
+*.sql text eol=lf
+*.rb text eol=lf
+*.erb text eol=lf
+*.json text eol=lf
+*.yml text eol=lf
+*.builder text eol=lf
+*.js text eol=lf
+*.jbuilder text eol=lf
+*.svg text eol=lf
+*.css text eol=lf
+*.scss text eol=lf
+*.png binary
+*.gif binary