Phillip Webb f4dcef281c Merge branch '1.2.x'

2015-09-03 11:30:08 -07:00

..

src

Merge branch '1.2.x'

2015-09-03 11:30:08 -07:00

application.properties

Add group discriminant in case of conflict

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

build.gradle

Fixup version numbers following release

2015-07-01 23:22:34 -07:00

pom.xml

Next development version

2015-07-01 22:48:01 -07:00