root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity
spring-framework/spring-context-support
History
Juergen Hoeller 3804b1c602 Merge branch '6.0.x' 
# Conflicts:
#	spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
#	spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
#	spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerUnitTests.java
 		2023-08-06 14:26:55 +02:00
..
src Merge branch '6.0.x' 2023-08-06 14:26:55 +02:00
spring-context-support.gradle Consistent dependency declarations 2023-08-02 00:56:50 +02:00