Merge branch 'develop' into feature/service-changes

This commit is contained in:
Dane Everitt
2017-01-12 13:15:37 -05:00
136 changed files with 2470 additions and 1737 deletions

View File

@@ -3,8 +3,10 @@ root = true
[*]
end_of_line = lf
insert_final_newline = true
[*.{php,js,html,css}]
charset = utf-8
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false