Skip to content

S
spring-boot
Commit 73b80dbe authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.1.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
parents 06e18c6a e130c00e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-dependencies/pom.xml
View file @ 73b80dbe
......@@ -111,7 +111,7 @@
<spring-data-releasetrain.version>Evans-RELEASE</spring-data-releasetrain.version>
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.1.0.M1</spring-integration.version>
<spring-loaded.version>1.2.0.RELEASE</spring-loaded.version>
<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.2.RELEASE</spring-mobile.version>
<spring-social.version>1.1.0.RELEASE</spring-social.version>
<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment