Merge branch '1.5.x' into 2.0.x

2018-05-25 18:45:37 -07:00
parent 606eb9dda3 e69296d7d3
commit 21d80d87a3
94 changed files with 401 additions and 341 deletions
--- a/spring-boot-samples/spring-boot-sample-custom-layout/src/main/java/sample/layout/SampleLayout.java
+++ b/spring-boot-samples/spring-boot-sample-custom-layout/src/main/java/sample/layout/SampleLayout.java
@@ -24,6 +24,8 @@ import org.springframework.boot.loader.tools.Layouts;
 import org.springframework.boot.loader.tools.LoaderClassesWriter;

 /**
+ * An example layout.
+ *
 * @author Phillip Webb
 */
 public class SampleLayout extends Layouts.Jar implements CustomLoaderLayout {