Merge branch 'master' into develop

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	messages/JsonMessages/MapDetailsData.ts
This commit is contained in:
Gregoire Parant
2022-05-05 11:55:41 +02:00
7 changed files with 40 additions and 3 deletions
+1
View File
@@ -49,6 +49,7 @@ class LocalAdmin implements AdminInterface {
iframeAuthentication: null,
loadingLogo: null,
loginSceneLogo: null,
showPoweredBy: true,
});
}