Sam Brannen d849f9816a Merge branch '5.3.x' ... # Conflicts: # build.gradle # spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java # spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java # spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java		2022-11-04 16:29:54 +01:00
..
src	Merge branch '5.3.x'	2022-11-04 16:29:54 +01:00
spring-webmvc.gradle	Allow spring-webmvc to be imported into Eclipse IDE again	2022-10-07 14:12:45 +02:00