Juergen Hoeller 38a41b6d01 Merge branch '6.2.x' ...

# Conflicts:
#	framework-platform/framework-platform.gradle

2025-01-15 18:29:30 +01:00

..

framework-platform.gradle

Merge branch '6.2.x'

2025-01-15 18:29:30 +01:00