Skip to content

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

Merge branch '1.1.x' into 1.2.x 

Conflicts:
	spring-boot-dependencies/pom.xml
parents 644237d1 936e1c21
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-dependencies/pom.xml
View file @ d428afb4
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version> <spring-loaded.version>1.2.1.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.3.RELEASE</spring-mobile.version> <spring-mobile.version>1.1.3.RELEASE</spring-mobile.version>
<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version> <spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>
<spring-security.version>3.2.6.RELEASE</spring-security.version> <spring-security.version>3.2.7.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version> <spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
<spring-social.version>1.1.0.RELEASE</spring-social.version> <spring-social.version>1.1.0.RELEASE</spring-social.version>
<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.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