Sam Brannen ae368a20b8 Merge branch '5.3.x' ... # Conflicts: # spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt # spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonEncoderTests.kt		2022-10-08 14:06:41 +02:00
..
src	Merge branch '5.3.x'	2022-10-08 14:06:41 +02:00
spring-tx.gradle	Relocate TestGenerationContext to spring-core-test	2022-09-05 16:21:17 +02:00