Phillip Webb 6f62fc854b Merge branch '1.1.x'

2014-09-03 11:45:54 -07:00

..

it

Merge branch '1.1.x'

2014-09-03 11:45:54 -07:00

main/java/org/springframework/boot/maven

Merge branch '1.1.x'

2014-09-03 11:45:54 -07:00

site

Clarify addResources parameter description

2014-09-02 15:54:40 +02:00

test/java/org/springframework/boot/maven

Add group discriminant in case of conflict

2014-09-03 11:22:53 -07:00