mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-21 21:39:05 +00:00
# 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