Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson 2015-02-09 10:18:40 +00:00
commit b40f689e1d

View File

@ -59,7 +59,7 @@
<commons-digester.version>2.1</commons-digester.version>
<commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.2</commons-pool2.version>
<crashub.version>1.3.0</crashub.version>
<crashub.version>1.3.1</crashub.version>
<dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
<flyway.version>3.1</flyway.version>
<freemarker.version>2.3.21</freemarker.version>