Olga Maciaszek-Sharma e41b177129 Merge branch '2.1.x' ...

# Conflicts:
#	pom.xml
#	spring-cloud-cloudfoundry-dependencies/pom.xml

2019-05-10 16:08:52 +02:00

..

src

Remove deprecated netflix-core dependency.

2019-05-10 16:06:58 +02:00

pom.xml

Merge branch '2.1.x'

2019-05-10 16:08:52 +02:00