Phillip Webb abd0b484bc Merge branch '2.3.x' into 2.4.x

2020-12-17 22:50:19 -08:00

..

src/main/java/org/springframework/boot/launchscript

Fix name clash with integration test apps

2020-12-17 22:00:12 -08:00

build.gradle

Merge branch '2.3.x' into 2.4.x

2020-12-17 22:50:19 -08:00

settings.gradle

Fix name clash with integration test apps

2020-12-17 22:00:12 -08:00