Stephane Nicoll 817111c6d3 Merge branch '1.2.x' ...

Conflicts:
	spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
	spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml

2015-09-01 16:46:22 +02:00

..

src

Polish deployment tests

2014-12-07 12:22:57 -08:00

pom.xml

Merge branch '1.2.x'

2015-09-01 16:46:22 +02:00