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 'develop' into feature/LDAP-new	2022-07-01 13:15:52 +03:00
Core	Merge branch 'release/v1.2' into develop	2022-06-30 16:13:31 +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
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	Merge branch 'develop' into feature/LDAP-new	2022-07-01 13:15:52 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/LDAP-new	2022-06-28 14:30:40 +03:00
Program.cs	modified LdapNotifyHelper to BackgroundService	2022-07-01 14:49:59 +03:00
Startup.cs	Merge branch 'develop' into feature/LDAP-new	2022-04-28 09:41:09 +03:00