root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
spring-boot/spring-boot-autoconfigure
History
Stephane Nicoll b1c2226e23 Merge branch '1.2.x' 
# Conflicts:
#	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java
 		2015-12-28 13:51:18 +01:00
..
src Merge branch '1.2.x' 2015-12-28 13:51:18 +01:00
pom.xml Next Development Version 2015-12-18 05:43:02 -08:00