From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri, 22 May 2020 14:27:05 +0000 (+0000)
Subject: Merge branch 'master' into v7.0
X-Git-Tag: v7.1.0rc2~1^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d736502958dac29bb85cad5b123a8e0f29707151;p=osm%2Fosmclient.git

Merge branch 'master' into v7.0

Change-Id: I2ad9f8f84d76eeee570b082729e0d941b2341f09
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

d736502958dac29bb85cad5b123a8e0f29707151