Josh Cummings 613165b86c Merge branch '6.0.x' 2 gadi atpakaļ
..
main 613165b86c Merge branch '6.0.x' 2 gadi atpakaļ
site cb4f3d2f44 Use UTF-8 for Java sources and XML 6 gadi atpakaļ
test 613165b86c Merge branch '6.0.x' 2 gadi atpakaļ