From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Wed, 10 Mar 2021 10:11:44 +0000 (+0100)
Subject: Merge branch 'master' into master-enterprise
X-Git-Tag: v1.0.30~2^2^2~2
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=8c446d49e88d7652f67b59d8369e86bae944bfec;p=e-mobility-charging-stations-simulator.git

Merge branch 'master' into master-enterprise

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

8c446d49e88d7652f67b59d8369e86bae944bfec
diff --cc .gitmodules
index 39379e61,781a05fb..b0c12bc9
--- a/.gitmodules
+++ b/.gitmodules
@@@ -4,5 -4,5 +4,5 @@@
  	branch = master
  [submodule "src/assets/configs-scp"]
  	path = src/assets/configs-scp
 -	url = ../../sap-labs-france/ev-scp-config.git
 +	url = ../../E-Mobility/ev-scp-config.git
-        branch = master
+        branch = master-qa