Merge branch '2.1.x'

2019-06-04 14:31:57 -07:00
parent e06325e029 0ef331018e
commit db75347eb6
36 changed files with 45 additions and 39 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
@@ -1 +1,2 @@

+
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/public-key-location
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/public-key-location
@@ -3,4 +3,4 @@ MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd
 UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs
 HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D
 o2kQ+X5xK9cipRgEKwIDAQAB
-----END PUBLIC KEY-----
+-----END PUBLIC KEY-----