Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor 2019-01-24 18:45:06 +00:00
commit 9d69154da5
3 changed files with 154 additions and 150 deletions

View File

@ -4,3 +4,7 @@ root = yes
[*] [*]
indent_size = 4 indent_size = 4
indent_style = tab indent_style = tab
[*.yml]
indent_size = 2
indent_style = space