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
..
CallContext.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
DispatchEngine.cs	fix Bug 57888	2022-06-30 19:41:17 +03:00
INotifyEngine.cs	refactoring: remove IServiceProvider	2022-03-31 20:32:46 +03:00
InterceptorStorage.cs	fixed warnings	2022-04-14 22:23:57 +03:00
NotifyEngine.cs	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
NotifyRequest.cs	add loggers in core.common	2022-05-05 17:13:47 +03:00
SendInterceptorSkeleton.cs	added new license headers	2022-03-15 21:00:53 +03:00
SingleRecipientInterceptor.cs	IDE1006	2022-03-25 19:26:06 +03:00