Merge branch '1.2.x'

e1152b4d · Phillip Webb · 24ca44db · dd19dd70 · e1152b4d
Commit e1152b4d authored Apr 13, 2015 by Phillip Webb
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

spring-boot-features.adoc spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +8 -0

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
@@ -638,6 +638,14 @@ For example, given the following `@ConfigurationProperties` class:

 		private String firstName;

+		public String getFirstName() {
+			return this.firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
 	}
 ----