Merge branch '1.2.x'

2015-10-09 13:39:09 -07:00
parent 3cabca7db4 94736719f1
commit 04074fece1
104 changed files with 38 additions and 120 deletions
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/package-info.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/package-info.java
@@ -18,4 +18,3 @@
 * Tools for generating executable JAR/WAR files.
 */
 package org.springframework.boot.loader.tools;
-