Lucio Maranta c86d7bf56b Merge branch 'feature/Attachments' into develop ...

# Conflicts:
#	Step/Controllers/WebApi/MaintenanceController.cs

2018-06-19 17:12:44 +02:00

..

AuthorizationController.cs

Fix Nc Data API

2018-06-06 16:23:36 +02:00

ConfigurationController.cs

Fix errors on API

2018-05-24 12:20:51 +02:00

LanguageController.cs

Fix alarm plc id

2018-03-21 09:43:55 +01:00

MaintenanceController.cs

Merge branch 'feature/Attachments' into develop

2018-06-19 17:12:44 +02:00

NcApiController.cs

Fix errors on API

2018-05-24 12:20:51 +02:00

ToolTableController.cs

Added list of maintenances api

2018-06-11 17:46:55 +02:00

UserController.cs

Fix Nc Data API

2018-06-06 16:23:36 +02:00