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

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

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

..

FunctionsAccessController.cs

Fix Nc Data API

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

MachinesController.cs

Fix Nc Data API

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

MachinesUsersController.cs

Added:

2018-06-19 11:13:48 +02:00

MaintenancesController.cs

Merge branch 'feature/Attachments' into develop

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

SessionsController.cs

Fix Nc Data API

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

UsersController.cs

Added new guest user

2018-06-19 12:54:49 +02:00