• Stephane Nicoll's avatar
    Merge branch '1.2.x' · 59cb5cf8
    Stephane Nicoll authored
    # Conflicts:
    #	spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
    #	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
    59cb5cf8
Name
Last commit
Last update
..
additional-spring-configuration-metadata.json Loading commit data...
spring.factories Loading commit data...