Merge pull request #80 from shinsenter/develop

v2.2.0

.editorconfig

@@ -0,0 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.gitattributes

@@ -1,8 +1,7 @@
-* text=lf
-/dist/defer.min.js -diff -merge
-/dist/defer.min.js.map -diff -merge
-/dist/defer_plus.min.js -diff -merge
-/dist/defer_plus.min.js.map -diff -merge
-/dist/polyfill.min.js -diff -merge
-/dist/polyfill.min.js.map -diff -merge
-/docs/* -diff -merge
+/dist/defer.min.js -diff -merge
+/dist/defer.min.js.map -diff -merge
+/dist/defer_plus.min.js -diff -merge
+/dist/defer_plus.min.js.map -diff -merge
+/dist/polyfill.min.js -diff -merge
+/dist/polyfill.min.js.map -diff -merge
+/docs/* -diff -merge