mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
2fbd54078b
# 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