Skip to content

S
spring-boot
Commit 7227c0df authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '1.0.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
parents 5205ccf8 08a6efff
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-dependencies/pom.xml
View file @ 7227c0df
......@@ -109,9 +109,9 @@
<spring-security.version>3.2.3.RELEASE</spring-security.version>
<spring-security-oauth.version>2.0.0.RC2</spring-security-oauth.version>
<spring-security-jwt.version>1.0.2.RELEASE</spring-security-jwt.version>
<thymeleaf.version>2.1.2.RELEASE</thymeleaf.version>
<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
<thymeleaf-layout-dialect.version>1.2.3</thymeleaf-layout-dialect.version>
<thymeleaf-layout-dialect.version>1.2.4</thymeleaf-layout-dialect.version>
<tomcat.version>7.0.53</tomcat.version>
</properties>
<prerequisites>
......
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