Merge branch '2.1.x'

19caff67 · Madhura Bhave · 6ee8cde5 · d000f3bc · 19caff67
Commit 19caff67 authored Dec 31, 2018 by Madhura Bhave
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 55 additions and 70 deletions

OAuth2ClientPropertiesRegistrationAdapterTests.java ...lient/OAuth2ClientPropertiesRegistrationAdapterTests.java +55 -70

No files found.
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java