Stephane Nicoll 39534aea6b Merge branch '1.5.x' ...

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

2016-10-04 13:02:53 +02:00

..

main

Merge branch '1.5.x'

2016-10-04 13:02:53 +02:00

test/java/org/springframework/boot

Fix LegacyCookieProcessor configuration example and test it

2016-09-15 14:53:14 +01:00