root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-04-21 15:16:26 +01:00
parent 6847608308 71ce0f6c95
commit 73e7f1eec0
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-parent/pom.xml
View File

@ -23,7 +23,6 @@
<json.version>20140107</json.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<json.version>20140107</json.version>
<maven.version>3.1.1</maven.version>
</properties>
<prerequisites>