Skip to content

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

Merge branch '1.1.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
parents 89cdd303 42e2b9a4
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-dependencies/pom.xml
View file @ d0d640b3
......@@ -64,7 +64,7 @@
<gemfire.version>7.0.2</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>1.6</gradle.version>
<groovy.version>2.3.7</groovy.version>
<groovy.version>2.3.8</groovy.version>
<gson.version>2.3</gson.version>
<h2.version>1.4.182</h2.version>
<hamcrest.version>1.3</hamcrest.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