Merge branch 1.2.x

2015-11-03 14:56:16 -08:00
parent 7a665c5f58 2118242e00
commit fd1cbed51c
2 changed files with 58 additions and 55 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -467,6 +467,7 @@ specified by the `spring.active.profiles` property are added after those configu
 the `SpringApplication` API and therefore take precedence.


+
 [[boot-features-external-config-placeholders-in-properties]]
 === Placeholders in properties
 The values in `application.properties` are filtered through the existing `Environment`