Juergen Hoeller 9d7849c539 Merge branch '5.2.x' ...

# Conflicts:
#	spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java

2020-09-05 13:02:01 +02:00

..

java/org/springframework/expression

Merge branch '5.2.x'

2020-09-05 13:02:01 +02:00

resources/org/springframework/expression/spel/generated

Harmonize resources location

2015-02-28 10:32:40 +01:00