spring-framework/spring-context
Juergen Hoeller 5051d7302d Merge branch '5.2.x'
# Conflicts:
#	build.gradle
#	spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
#	spring-web/src/main/java/org/springframework/http/HttpHeaders.java
#	spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java
2020-06-06 15:27:15 +02:00
..
src Merge branch '5.2.x' 2020-06-06 15:27:15 +02:00
.springBeans
spring-context.gradle Upgrade to BeanShell 2.0b6 2020-04-07 18:06:43 +02:00