Merge remote-tracking branch 'origin/CmsConnectGateway' into develop

# Conflicts: # Step.Model/ConfigModels/ServerConfigModel.cs # Step/Controllers/WebApi/ConfigurationController.cs
2019-08-28 14:33:54 +02:00
parent b379270a09 5d2544a2ae
commit 7c2cb28a56
48 changed files with 3240 additions and 252 deletions
@@ -19,7 +19,7 @@ namespace Step.Model.ConfigModels

        public string MTCFolderPath { get; set; }
        public string MTCApplicationName { get; set; }
-        public bool CMSConnectReady { get; set; }
+
        public int MaxAlarmsRows { get; set; }
        public int AlarmToDelete { get; set; }
    }