Merge branch '2.1.x'

# Conflicts: # docs/pom.xml # pom.xml # spring-cloud-security-dependencies/pom.xml # spring-cloud-security/pom.xml # spring-cloud-starter-oauth2/pom.xml # spring-cloud-starter-security/pom.xml
HOpenSource · Sep 18, 2019 · f93064d · f93064d
2 parents fd17419 + bd11a93
commit f93064d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/spring-cloud-starter-oauth2/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-oauth2/src/main/resources/META-INF/spring.provides
diff --git a/spring-cloud-starter-security/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-security/src/main/resources/META-INF/spring.provides