spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-29 21:59:02 +00:00
Code Issues Projects Releases Wiki Activity
Files
4940ca37ebea83bf618b9b5c082462a2a7aa2a21
spring-boot/spring-boot-autoconfigure
T
History
Phillip Webb 6333d4c617 Merge branch '1.1.x' 
Conflicts:
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java
	spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java
2015-01-02 15:31:39 -08:00
..
src
Merge branch '1.1.x'
2015-01-02 15:31:39 -08:00
.gitignore
Restore test classes
2014-06-01 13:11:25 +01:00
pom.xml
Auto-configure for Thymeleaf conditionalcomments
2014-12-17 16:23:28 -08:00