Stephane Nicoll 064faf9560 Merge branch '1.5.x'

2017-02-09 10:43:20 +01:00

..

main

Merge branch '1.5.x'

2017-02-09 10:43:20 +01:00

test/java/org/springframework/boot

Rename EmbeddedServletContainer -> EmbeddedWebServer

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