[CI-SKIP] Merge branch 'master' into pre/1.13

* master: [CI-SKIP] add .editorconfig for base code style settings
2018-08-07 01:14:43 -04:00 · 2018-08-07 01:14:43 -04:00 · a2639a8002
Commit a2639a8002
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,6 @@
+[*.java]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=4