Lucio Maranta b379270a09 Merge branch 'integratedFileEditor' into develop ...

# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/ro.xml

2019-08-28 14:29:51 +02:00

..

Config

Merge branch 'integratedFileEditor' into develop

2019-08-28 14:29:51 +02:00

Properties

* Fixed webapi auth

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

Report

Fix timeline date

2019-03-12 09:56:58 +01:00

ServerConfig.cs

WIP custom main program

2019-06-18 15:43:45 +02:00

ServerConfigController.cs

Merge branch 'integratedFileEditor' into develop

2019-08-28 14:29:51 +02:00

Step.Config.csproj

WIP custom main program

2019-06-18 15:43:45 +02:00