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-tests/spring-boot-integration-tests/spring-boot-server-tests
History
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
 		2022-02-17 10:56:23 +01:00
..
spring-boot-server-tests-app Merge branch '2.7.x' 2022-02-17 10:56:23 +01:00
src/intTest/java/org/springframework/boot/context/embedded Merge branch '2.4.x' 2021-10-29 13:48:36 +01:00
build.gradle Merge branch '2.4.x' into 2.5.x 2021-11-12 20:31:25 +00:00