Stephane Nicoll 20bd0f94d6 Merge branch '1.5.x'

2017-02-28 15:58:23 +01:00

..

main

Merge branch '1.5.x'

2017-02-28 15:58:23 +01:00

test/java/org/springframework/boot

Rename EmbeddedServletContainer -> EmbeddedWebServer

2017-02-06 17:44:26 +01:00