akuksin
f09271ae2c
Merge branch 'master' into request-response
# Conflicts:
# spring-boot/request-response/client/gradle/wrapper/gradle-wrapper.jar
# spring-boot/request-response/client/gradle/wrapper/gradle-wrapper.properties
# spring-boot/request-response/client/gradlew
# spring-boot/request-response/client/gradlew.bat
# spring-boot/request-response/server/gradle/wrapper/gradle-wrapper.jar
# spring-boot/request-response/server/gradle/wrapper/gradle-wrapper.properties
# spring-boot/request-response/server/gradlew
# spring-boot/request-response/server/gradlew.bat