Phillip Webb 913e831f4e Merge '1.5.x' into 2.0.x

2019-07-24 11:39:58 +01:00

..

main

Merge branch '1.5.x' into 2.0.x

2019-07-17 21:47:04 +01:00

test/java/sample/war

Update copyright header for changed files

2019-07-24 11:37:23 +01:00