merge to next

2017-01-30 11:04:14 -05:00 · 2017-01-30 11:04:14 -05:00 · 6ab2b6b6c3
commit 6ab2b6b6c3
parent 40592d328c 84d7c722f9
31 changed files with 17724 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1,7 @@
-* text=auto
+<<<<<<< HEAD
+* text=auto
+=======
+* text eol=crlf
+*.min.js binary
+*.map binary
+>>>>>>> origin/next