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>

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