spring-framework/spring-context-support
Juergen Hoeller 399453d9f1 Merge branch '5.2.x'
# Conflicts:
#	spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
#	spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
2020-05-22 17:16:09 +02:00
..
src Merge branch '5.2.x' 2020-05-22 17:16:09 +02:00
spring-context-support.gradle Use Gradle test fixture support for spring-tx 2020-01-02 16:01:35 +01:00