Merge branch 'master' into master

This commit is contained in:
Moien Tajik 2019-03-07 21:42:56 +03:30 committed by GitHub
commit b41d35b46f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
## IDE-independent coding style via EditorConfig: http://editorconfig.org/ ## IDE-independent coding style via EditorConfig: https://editorconfig.org/
root = true root = true
@ -8,4 +8,4 @@ indent_size = 4
end_of_line = crlf end_of_line = crlf
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true