Lucio Maranta 29c4747785 Merge branch 'feature/Remove_autoinc_from_db' into develop ...

# Conflicts:
#	Step.Database/Migrations/201809181022557_InitMigration.Designer.cs
#	Step.Database/Migrations/201809181022557_InitMigration.cs
#	Step.Database/Migrations/201810041521424_InitMigration.Designer.cs
#	Step.Database/Migrations/201810041521424_InitMigration.cs
#	Step.Database/Migrations/201810100646276_InitMigration.Designer.cs
#	Step.Database/Migrations/201810100646276_InitMigration.cs
#	Step.Database/Step.Database.csproj
WIP Alarm

2018-10-16 16:57:46 +02:00

..

Config

Merge remote-tracking branch 'origin/develop' into feature/Remove_autoinc_from_db

2018-10-04 17:19:41 +02:00

Properties

* Fixed webapi auth

2017-11-28 17:19:01 +01:00

ServerConfig.cs

Added Job Editor in Client CMS

2018-09-21 11:21:45 +02:00

ServerConfigController.cs

WIP removed autoincrement

2018-09-25 15:27:58 +02:00

Step.Config.csproj

Added macros API

2018-09-20 13:03:02 +02:00