Merge branch '1.4.x' into 1.5.x

2019-03-27 14:04:32 +00:00
parent 46065e2f99 f05f858286
commit 94633cfd89
127 changed files with 568 additions and 566 deletions
--- a/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/resources/static/index.html
+++ b/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/resources/static/index.html
@@ -8,7 +8,7 @@
 	<div class="container">
 		<div class="navbar">
 			<div class="navbar-inner">
-				<a class="brand" href="http://spring.io"> Spring </a>
+				<a class="brand" href="https://spring.io"> Spring </a>
 				<ul class="nav">
 					<li><a href="/"> Home </a></li>
 				</ul>