Stephane Nicoll 58050fb72f Merge branch '1.4.x' into 1.5.x ...

# Conflicts:
#	spring-boot-dependencies/pom.xml

2016-10-04 13:01:46 +02:00

..

src

Merge branch '1.4.x' into 1.5.x

2016-10-04 13:01:46 +02:00

pom.xml

Remove support for Velocity following its deprecation in 1.4

2016-09-29 15:44:36 +01:00