Merge branch 'master' into develop

2019-09-06 13:14:50 +02:00
parent af15fe5ec6 65959b25bf
commit 2967197b8e
1 changed files with 1 additions and 1 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2