Andy Wilkinson 56690a7eb9 Merge branch '2.6.x' into 2.7.x ... Closes gh-30791		2022-04-25 15:03:32 +01:00
..
src	Merge branch '2.6.x' into 2.7.x	2022-04-25 15:03:32 +01:00
build.gradle	Exclude duplicate properties file when building a jar from jars	2022-02-11 15:31:20 -06:00