Phillip Webb 6f62fc854b Merge branch '1.1.x'

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

..

org/springframework/boot/loader

Add group discriminant in case of conflict

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

sample/simple

Add group discriminant in case of conflict

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

src

Remote trailing whitespace

2014-07-02 15:17:14 -07:00

application.properties

Add group discriminant in case of conflict

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

build.gradle

Merge branch '1.1.x'

2014-08-07 13:16:27 -07:00

pom.xml

Next development version

2014-08-07 11:59:17 -07:00