root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
spring-boot/spring-boot-tools/spring-boot-configuration-p.../src
History
Stephane Nicoll 141907c65f Merge branch '1.2.x' 
# Conflicts:
#	spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
#	spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
 		2015-11-26 20:25:00 +01:00
..
main Merge branch '1.2.x' 2015-11-26 20:25:00 +01:00
test Merge branch '1.2.x' 2015-11-26 20:25:00 +01:00