Merge branch '1.1.x'

This commit is contained in:
Stephane Nicoll 2014-12-23 11:54:54 +01:00
commit 4a314321d7

View File

@ -125,7 +125,7 @@
<spring-social-twitter.version>1.1.0.RELEASE</spring-social-twitter.version>
<spring-ws.version>2.2.0.RELEASE</spring-ws.version>
<sun-mail.version>${javax-mail.version}</sun-mail.version>
<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
<thymeleaf-layout-dialect.version>1.2.7</thymeleaf-layout-dialect.version>