spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity
Files
3bedf42fbc17033c92bd48efb5800451190cb4e5
spring-framework/spring-context/src
T
History
Juergen Hoeller 687fc935a8 Merge branch '6.2.x' 
# Conflicts:
#	spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
#	spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
#	spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java
2025-10-21 01:04:38 +02:00
..
jmh/java/org/springframework/context
Update copyright headers in source files
2025-06-17 16:23:50 +02:00
main
Merge branch '6.2.x'
2025-10-21 01:04:38 +02:00
test
Fix @Import with multiple bean registrars
2025-10-20 17:36:51 +02:00
testFixtures/java/org/springframework/context/testfixture
Fix @Import with multiple bean registrars
2025-10-20 17:36:51 +02:00