Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0.x'

Browse Source 
Conflicts: MessageSourceAutoConfiguration.java
This commit is contained in:
Dave Syer
2015-08-21 17:13:19 +01:00
parent 2583f8050a 68b55adac0
commit ff8a4d0f9d
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@@ -2129,4 +2129,4 @@
<id>integration-test</id>
</profile>
</profiles>
</project>
</project>