You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
spring-boot/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests
Moritz Halbritter 42808ff13c Merge branch '2.7.x'
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
3 years ago
..
spring-boot-server-tests-app Merge branch '2.7.x' 3 years ago
src/intTest/java/org/springframework/boot/context/embedded Merge branch '2.4.x' 3 years ago
build.gradle Merge branch '2.4.x' into 2.5.x 3 years ago