Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-04-04 09:27:42 +01:00
commit d61a748222

3
.editorconfig Normal file
View File

@ -0,0 +1,3 @@
[*]
indent_style = tab
indent_size = 4