Juergen Hoeller c6347025d6 Merge branch '6.1.x' ... # Conflicts: # spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java		2024-07-08 19:54:07 +02:00
..
src	Merge branch '6.1.x'	2024-07-08 19:54:07 +02:00
spring-webmvc.gradle	Introduce support for webjars-locator-lite	2024-04-02 10:16:51 +02:00