mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-17 16:39:29 +00:00
# Conflicts: # spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java # spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java