root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
spring-boot/spring-boot-docs
History
Stephane Nicoll 59cb5cf8d9 Merge branch '1.2.x' 
# Conflicts:
#	spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
#	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
 		2015-12-10 15:40:44 +01:00
..
src/main Merge branch '1.2.x' 2015-12-10 15:40:44 +01:00
pom.xml Next Development Version 2015-11-16 03:18:54 -08:00