Juergen Hoeller cd835b3124 Merge branch '5.2.x' ...

# Conflicts:
#	spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
#	spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java

2020-10-13 11:35:36 +02:00

..

src

Merge branch '5.2.x'

2020-10-13 11:35:36 +02:00

spring-web.gradle

Upgrade to kotlinx.serialization 1.0.0

2020-10-09 12:41:52 +02:00