Andy Wilkinson 94633cfd89 Merge branch '1.4.x' into 1.5.x

2019-03-27 14:04:32 +00:00

..

java/org/springframework/boot/test

Merge branch '1.4.x' into 1.5.x

2019-03-27 14:04:32 +00:00

resources/META-INF

Log a warning during tests when multiple JSONOjects on the class path

2017-06-06 21:35:33 +01:00