Merge branch 'master' into master-enterprise

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/.gitmodules b/.gitmodules
index 39379e615498f676e1473f7554aa95403ddee988..b0c12bc9a3cb0ec1a94c598ce7b0d48abe68e06f 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,4 +5,4 @@
 [submodule "src/assets/configs-scp"]
        path = src/assets/configs-scp
        url = ../../E-Mobility/ev-scp-config.git
-       branch = master
+       branch = master-qa