Commit 5eeab3a4 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.2.x'

parents 00ba7bea acb3fb53
......@@ -148,7 +148,7 @@
<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>
<spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>
<spring-social-twitter.version>1.1.2.RELEASE</spring-social-twitter.version>
<spring-ws.version>2.2.3.RELEASE</spring-ws.version>
<spring-ws.version>2.2.4.RELEASE</spring-ws.version>
<statsd-client.version>3.1.0</statsd-client.version>
<sun-mail.version>${javax-mail.version}</sun-mail.version>
<thymeleaf.version>2.1.4.RELEASE</thymeleaf.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