Merge branch '1.1.x'

dde7ebf3 · Andy Wilkinson · 3a1e631a · a4e08bee · dde7ebf3
Commit dde7ebf3 authored Sep 07, 2014 by Andy Wilkinson
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

spring-boot-features.adoc spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +7 -6

No files found.
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -368,6 +368,7 @@ For example, the following YAML document:

 [source,yaml,indent=0]
 ----
+	environments:
 		dev:
 			url: http://dev.bar.com
 			name: Developer Setup