Juergen Hoeller 3b1af692cc Merge branch '6.0.x' ... # Conflicts: # spring-beans/spring-beans.gradle # spring-context/spring-context.gradle # spring-orm/spring-orm.gradle # spring-test/spring-test.gradle # spring-web/spring-web.gradle # spring-webflux/spring-webflux.gradle		2023-08-02 01:04:31 +02:00
..
src	Merge branch '6.0.x'	2023-08-02 00:16:55 +02:00
spring-webmvc.gradle	Merge branch '6.0.x'	2023-08-02 01:04:31 +02:00