Commit cf0018e8 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.1.x'

parents 24f95b97 5e5e7079
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<mockito.version>1.9.5</mockito.version> <mockito.version>1.9.5</mockito.version>
<mongodb.version>2.12.3</mongodb.version> <mongodb.version>2.12.3</mongodb.version>
<mysql.version>5.1.32</mysql.version> <mysql.version>5.1.32</mysql.version>
<reactor.version>1.1.4.RELEASE</reactor.version> <reactor.version>1.1.5.RELEASE</reactor.version>
<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version> <reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
<servlet-api.version>3.0.1</servlet-api.version> <servlet-api.version>3.0.1</servlet-api.version>
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.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