Sam Brannen b61ac6315a Merge branch '5.3.x' ... # Conflicts: # spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java		2022-07-05 13:27:09 +02:00
..
src	Merge branch '5.3.x'	2022-07-05 13:27:09 +02:00
spring-webmvc.gradle	Upgrade to Groovy 4.0	2022-02-04 21:01:02 +01:00