spring-framework/spring-context
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
.springBeans Rename modules {org.springframework.*=>spring-*} 2012-01-31 14:37:10 +01:00
spring-context.gradle Upgrade to BeanShell 2.0b6 2020-04-07 18:06:43 +02:00