Juergen Hoeller 6c631e3d5c Merge branch '5.2.x' ... # Conflicts: # spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java		2020-09-25 11:36:18 +02:00
..
src	Merge branch '5.2.x'	2020-09-25 11:36:18 +02:00
.springBeans	…
spring-context.gradle	Upgrade to BeanShell 2.0b6	2020-04-07 18:06:43 +02:00