Sam Brannen d45b5f6e8a Merge branch '5.3.x' ... # 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		2022-05-10 11:44:14 +02:00
..
src	Merge branch '5.3.x'	2022-05-10 11:44:14 +02:00
spring-web.gradle	Remove Jakarta Mail dependency from spring-web	2022-04-28 15:39:52 +02:00