Juergen Hoeller 89d563097f Merge branch '6.1.x' ...

# Conflicts:
#	spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java

2024-03-16 23:24:51 +01:00

..

java/org/springframework/web/testfixture

Merge branch '6.1.x'

2024-03-16 23:24:51 +01:00

resources/org/springframework/http/codec/multipart

Use Gradle test fixture support for spring-web

2020-01-02 16:01:35 +01:00