root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
spring-framework/spring-context/src
History
Juergen Hoeller 1279b3b822 Merge branch '5.2.x' 
# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
#	spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java
 		2020-06-11 23:53:27 +02:00
..
main Merge branch '5.2.x' 2020-06-11 23:53:27 +02:00
test Deprecate InstantiationAwareBeanPostProcessorAdapter 2020-05-29 23:07:10 +02:00
testFixtures/java/org/springframework/context/testfixture Rename test fixture package in spring-context 2020-01-02 16:01:35 +01:00