pavelbannov a66c03aa86 Merge branch 'develop' into feature/logger-refactoring ... # Conflicts: # common/ASC.Common/Caching/AscCache.cs # common/ASC.Common/GlobalUsings.cs # common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs # common/ASC.Data.Storage/GlobalUsings.cs # common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs # common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs # common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs # common/services/ASC.Notify/GlobalUsings.cs # common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs # common/services/ASC.Notify/Services/NotifySenderService.cs # common/services/ASC.TelegramService/GlobalUsings.cs # common/services/ASC.TelegramService/TelegramHandler.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/GlobalUsings.cs # products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/Settings/StorageController.cs		2022-05-24 23:13:57 +03:00
..
Settings	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
AuthenticationController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
CapabilitiesController.cs	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
LdapController.cs	replace controllers	2022-03-01 13:03:25 +03:00
ModulesController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
PortalController.cs	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
SecurityController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
SmtpSettingsController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
SsoSettingsV2Controller.cs	replace controllers	2022-03-01 13:03:25 +03:00
ThirdPartyController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00