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-deployment-tests/src/intTest/resources	Test servlet 3.1 compatibility in deployment tests	2021-12-09 12:24:43 +00:00
spring-boot-integration-tests	Merge branch '2.7.x'	2022-02-17 10:56:23 +01:00
spring-boot-smoke-tests	Update copyright year of changed files	2022-02-16 20:44:54 -08:00