spring-boot/spring-boot-autoconfigure
Phillip Webb 6281070d0a Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
2014-10-09 13:00:27 -07:00
..
src Merge branch '1.1.x' 2014-10-09 13:00:27 -07:00
.gitignore
pom.xml Support Jackson based XML serialization and Jackson2ObjectMapperBuilder 2014-10-06 10:54:38 +01:00