From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 7 May 2020 13:37:26 +0000 (+0000)
Subject: merge master into v7.0 for v7.1.0
X-Git-Tag: v7.1.0rc1~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=45be2ac35016efcad22ab570f60a0ceb0abe8031;hp=45be2ac35016efcad22ab570f60a0ceb0abe8031;p=osm%2FNBI.git

merge master into v7.0 for v7.1.0

Change-Id: I61e59345dc412251da86f5364b2428da8aa232f3
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---