Merge branch 'master' into v7.0 99/8499/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 20 Jan 2020 21:39:57 +0000 (21:39 +0000)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 20 Jan 2020 21:39:57 +0000 (21:39 +0000)
commit7c12d41e92545ab962f31417a73524b007cf808f
treef9bd973c741d42961ab4b405ebea9eaea4583c5b
parent271442f397982a916288d3f17e7baba61a8f5e9d
parentac0e5fbbf8103186fe5a18f2420ddca87380552b
Merge branch 'master' into v7.0

Change-Id: I0b8da73514a19adcfe8fd9e5d1a2e1b24f40a6f8
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
tox.ini