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	ElasticSearch: moved from 08a01422	2021-05-23 19:11:25 +03:00
Models	Method GetAuthProviders moved to PeopleController	2021-04-25 11:46:44 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
Resources	Removed unused resources	2019-08-13 16:05:36 +03:00
.gitignore	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
appsettings.json	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
ASC.People.csproj	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
PeopleProduct.cs	Big Fix commit:	2021-03-22 00:34:21 +03:00
Program.cs	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
Startup.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00