pavelbannov 7af929fee8 Merge branch 'release/v1.2' into develop ... # Conflicts: # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.People/Server/Controllers/PeopleController.cs # products/ASC.People/Server/Models/MemberModel.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2022-07-07 17:41:41 +03:00
..
Api	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ApiModels	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
Log	Log: refactoring	2022-05-26 12:01:54 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
Resources	Merge branch 'release/v1.2' into develop	2022-06-19 22:44:48 +03:00
.gitignore
appsettings.json
ASC.People.csproj	Merge branch 'develop' into feature/docspace	2022-06-20 12:15:08 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/docspace-pin	2022-06-08 16:38:16 +03:00
PeopleProduct.cs	IDE1006	2022-03-25 19:26:06 +03:00
Program.cs	refactor	2022-03-23 19:23:25 +03:00
Startup.cs	refactoring	2022-04-15 12:08:06 +03:00