mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
955f9d3ea9
# Conflicts: # spring-beans/src/main/java/org/springframework/beans/factory/support/BeanRegistryAdapter.java # spring-context/src/main/java/org/springframework/context/annotation/Import.java