Merge current v2.4 into master

2021-06-22 14:05:57 +02:00
parent dca348359b 5dab09c42b
commit ce2e02b690
119 changed files with 4628 additions and 4165 deletions
--- a/docs/content/reference/static-configuration/cli-ref.md
+++ b/docs/content/reference/static-configuration/cli-ref.md
@@ -538,7 +538,7 @@ KV Username
 Enable debug logging of generated configuration template. (Default: ```false```)

 `--providers.file.directory`:  
-Load dynamic configuration from one or more .toml or .yml files in a directory.
+Load dynamic configuration from one or more .yml or .toml files in a directory.

 `--providers.file.filename`:  
 Load dynamic configuration from a file.