Juergen Hoeller 7f79a373c3 Merge branch '5.2.x' ...

# Conflicts:
#	build.gradle

2020-06-17 15:42:18 +02:00

..

src

Merge branch '5.2.x'

2020-06-17 15:42:18 +02:00

spring-tx.gradle

Upgrade to Kotlin 1.4 M2

2020-06-16 15:21:57 +02:00