Lucio Maranta 724ac2afb8 Merge branch 'feature/Scada' into develop ...

# Conflicts:
#	Client.Utils/Constants.cs
#	Client/View/NcWindow.cs
#	Libs/CMS_CORE_Library.dll
#	Step.Config/Config/serverConfig.xml
#	Step.Core/ThreadsFunctions.cs
#	Step.Model/Constants.cs
#	Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
#	Step.Model/DatabaseModels/NcMagazinePositionModel.cs
#	Step.Model/Step.Model.csproj

2019-01-15 16:58:18 +01:00

..

SignalR

WriteM155 response

2018-11-16 12:06:22 +01:00

WebApi

Merge branch 'feature/Scada' into develop

2019-01-15 16:58:18 +01:00