pavelbannov 570ede7bba Merge branch 'develop' into feature/11.5.2 ... # Conflicts: # common/ASC.Data.Storage/StorageUploader.cs # common/services/ASC.Data.Backup/Service/BackupWorker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2021-05-31 13:32:51 +03:00
..
Controllers	Merge branch 'develop' into feature/11.5.2	2021-05-31 13:32:51 +03:00
Core	WebStudio: resources	2021-05-27 21:30:15 +03:00
Models	Web.Core: moved from 08a01422	2021-05-24 20:41:31 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
Startup.cs	Fixed loading products, lazy loading webitemmanager	2021-01-26 12:29:50 +03:00