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
..
src	Merge branch '1.2.x'	2015-11-26 20:25:00 +01:00
pom.xml	Next Development Version	2015-11-16 03:18:54 -08:00