Merge branch 'release/4.2.6'

dlueth · Jan 30, 2018 · 4c6fb80 · 4c6fb80
2 parents 76dbb5d + da533a4
commit 4c6fb80
Show file tree

Hide file tree

Showing 39 changed files with 6,717 additions and 739 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true