Merge branch '1.1.x'

1f9515cd · Andy Wilkinson · f2812afb · f8477bd6 · 1f9515cd
Commit 1f9515cd authored Oct 01, 2014 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

foo.jar ...esources/multi-project-common-file-dependency/lib/foo.jar +0 -0

No files found.
--- a/spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar
+++ b/spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar