Merge current v2.4 into master

2021-06-22 14:05:57 +02:00 · 2021-06-22 14:05:57 +02:00 · ce2e02b690
commit ce2e02b690
parent dca348359b 5dab09c42b
119 changed files with 4628 additions and 4165 deletions
--- a/docs/content/reference/dynamic-configuration/file.md
+++ b/docs/content/reference/dynamic-configuration/file.md
@ -3,10 +3,10 @@
 Dynamic configuration with files
 {: .subtitle }

-```toml  tab="TOML"
--8<-- "content/reference/dynamic-configuration/file.toml"
-```
-
 ```yml  tab="YAML"
 --8<-- "content/reference/dynamic-configuration/file.yaml"
 ```
+
+```toml  tab="TOML"
+--8<-- "content/reference/dynamic-configuration/file.toml"
+```