Merge branch 'master' into develop

This commit is contained in:
Dries Vints 2019-09-06 13:14:50 +02:00
commit 2967197b8e
No known key found for this signature in database
GPG Key ID: BDD2ED2E8C8025E7
1 changed files with 1 additions and 1 deletions

View File

@ -11,5 +11,5 @@ trim_trailing_whitespace = true
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false
[*.yml] [*.{yml,yaml}]
indent_size = 2 indent_size = 2