Merge branch '2.0.x' into 2.1.x

2019-06-04 02:07:14 -07:00
parent d057f49618 b442d3b906
commit ccfbd03482
107 changed files with 130 additions and 112 deletions
--- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql
+++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql
@@ -7,4 +7,4 @@ create table users (
 create table authorities (
  username varchar(256),
  authority varchar(256)
-);
+);
--- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html
+++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html
@@ -31,4 +31,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>