Merge branch '1.1.x'
Conflicts: spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
Showing
Please register or sign in to comment