Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

132 files changed, 11027 insertions, 2857 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..8fd1fd7525
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,93 @@
+# auto for anything unspecified
+* text=auto
+
+# sources
+*.c text
+*.cc text
+*.cxx text
+*.cpp text
+*.c++ text
+*.hpp text
+*.h text
+*.h++ text
+*.hh text
+*.bat    text
+*.coffee text
+*.css    text
+*.htm    text
+*.html   text
+*.inc    text
+*.ini    text
+*.js     text
+*.jsx    text
+*.json   text
+*.less   text
+*.php    text
+*.pl     text
+*.py     text
+*.rb     text
+*.sass   text
+*.scm    text