From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Wed, 10 Mar 2021 09:41:02 +0000 (+0100)
Subject: Merge branch 'master' of github.com:sap-labs-france/ev-simulator into master-enterprise
X-Git-Tag: v1.0.30~2^2^2~3
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=e8372996b29eaedd918d94f8454c4c91c925575f;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>
---

e8372996b29eaedd918d94f8454c4c91c925575f
diff --cc .gitmodules
index f4765c5a,f4a3831f..39379e61
--- a/.gitmodules
+++ b/.gitmodules
@@@ -4,4 -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