Phillip Webb 01900c8342 Merge branch '1.5.x'

2016-10-11 23:42:14 -07:00

..

main

Merge branch '1.5.x'

2016-10-11 23:42:14 -07:00

test/java/org/springframework/boot/loader/tools

Allow default value for CONF_FOLDER to be set at build time

2016-08-11 20:25:59 +01:00