Andy Wilkinson 30f0fd1fe4 Merge branch '1.5.x' into 2.0.x

2018-06-21 17:31:16 +01:00

..

java/sample/jsp

Polish

2018-01-25 13:20:29 -08:00

resources

Fix checkstyle violations in samples

2018-05-25 18:18:00 -07:00

webapp/WEB-INF/jsp

Polish "Fix JSP availability check when not running as a packaged war"

2018-06-21 17:30:12 +01:00