Stephane Nicoll 2ba3b27954 Merge branch '1.4.x' into 1.5.x ... # Conflicts: # spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java # spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc		2016-11-18 11:56:22 +09:00
..
src	Merge branch '1.4.x' into 1.5.x	2016-11-18 11:56:22 +09:00
pom.xml	Next Development Version	2016-11-08 16:55:37 +00:00