Merge remote-tracking branch 'origin/master' into voting

This commit is contained in:
Manfred Karrer 2018-03-30 11:19:04 -05:00
commit 5aee2c2789
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
2 changed files with 64 additions and 61 deletions

View file

@ -9,6 +9,9 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[build.gradle]
continuation_indent_size = 4
[.idea/codeStyles/*.xml]
indent_size = 2
insert_final_newline = false