merge to next

This commit is contained in:
Leo 2017-01-30 11:04:14 -05:00
commit 6ab2b6b6c3
31 changed files with 17724 additions and 1 deletions

View file

@ -5,6 +5,11 @@ charset = utf-8
[*.js]
indent_style = tab
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
<<<<<<< HEAD
end_of_line = lf
=======
end_of_line = crlf
>>>>>>> origin/next