Merge branch '2.6.x' into 2.7.x

Closes gh-30121
pull/30406/head
Stephane Nicoll 3 years ago
commit a71d9f5088

@ -120,7 +120,7 @@ For example, to look for `myproject.properties` and `myproject.yaml` files you c
---- ----
You can also refer to an explicit location by using the configprop:spring.config.location[] environment property. You can also refer to an explicit location by using the configprop:spring.config.location[] environment property.
This properties accepts a comma-separated list of one or more locations to check. This property accepts a comma-separated list of one or more locations to check.
The following example shows how to specify two distinct files: The following example shows how to specify two distinct files:

Loading…
Cancel
Save