mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.2.x'
This commit is contained in:
commit
73e7f1eec0
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user