From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Thu, 15 Apr 2021 12:32:44 +0000 (+0200)
Subject: Merge branch 'master' of github.com:sap-labs-france/ev-simulator into master-enterprise
X-Git-Tag: v1.0.30~2^2^2~1
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=431c489c2b4b442ffad31573222b910780887495;p=e-mobility-charging-stations-simulator.git

Merge branch 'master' of github.com:sap-labs-france/ev-simulator into master-enterprise

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

431c489c2b4b442ffad31573222b910780887495
diff --cc .gitmodules
index b0c12bc9,2f0f358d..1fb2c5b1
--- 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
 -	branch = master-qa
 +	url = ../../E-Mobility/ev-scp-config.git
-        branch = master-qa
++        branch = master-qa