Merge branch '1.5.x'

d61a7482 · Andy Wilkinson · f5d9ff13 · 6d8846d9 · d61a7482
Commit d61a7482 authored Apr 04, 2017 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

.editorconfig .editorconfig +3 -0

No files found.
--- a/.editorconfig
+++ b/.editorconfig
+[*]
+indent_style = tab
+indent_size = 4
\ No newline at end of file