Juergen Hoeller 2fbd54078b Merge branch '6.2.x' ...

# Conflicts:
#	spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
#	spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java

2025-03-04 18:46:39 +01:00

..

src

Merge branch '6.2.x'

2025-03-04 18:46:39 +01:00

spring-webmvc.gradle

Merge branch '6.2.x'

2025-02-12 17:50:22 +01:00