Skip to content

Commit c5dbed5

Browse files
OlgaMaciaszekOlgaMaciaszek
committed
Merge remote-tracking branch 'olga/draft-interface-clients-autoconfiguration' into draft-interface-clients-autoconfiguration
# Conflicts: # spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/AbstractInterfaceClientsImportRegistrar.java # spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/QualifiedBeanProvider.java # spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/HttpClient.java # spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/rsocket/RSocketClient.java
2 parents a7b3265 + ad87582 commit c5dbed5

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)