Lucio Maranta 0e6af444d6 Fix merge

2018-08-03 13:16:07 +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

Add localized maintenances description

2018-07-10 15:07:37 +02:00

NcToolManagerController.cs

Fix load in magazine

2018-08-03 11:21:29 +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

UserSoftkeysController.cs

Fix merge

2018-08-03 13:16:07 +02:00