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
Phillip Webb 083f9757cd Merge branch '1.1.x' 
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
 		2014-12-08 11:16:09 -08:00
..
src/main Merge branch '1.1.x' 2014-12-08 11:16:09 -08:00
pom.xml Next development version 2014-11-11 17:12:24 -08:00