Merge "Merge branch 'master' into v7.0" into v7.0
authorbeierlm <mark.beierl@canonical.com>
Fri, 22 May 2020 15:22:48 +0000 (17:22 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Fri, 22 May 2020 15:22:48 +0000 (17:22 +0200)
commit09d86dfb0ab2d18aa5b8909a19cf90ac09b1ba05
treedf8186de1e9ef9f1dfa356b522a1c8ef18b48988
parentcc0db9ace36de244a1ce66b6694547a75239aa09
parentd736502958dac29bb85cad5b123a8e0f29707151
Merge "Merge branch 'master' into v7.0" into v7.0