Merge branch '6.2.x'

Browse Source

...

This commit is contained in:

Sam Brannen

2025-05-21 15:40:34 +02:00

parent 2e086bd727 d890a38f3c

commit 88ce11abc8

4 changed files with 108 additions and 74 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties → spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig.properties