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
..
AscCache.cs	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
CacheNotifyAction.cs	added new license headers	2022-03-15 21:00:53 +03:00
ICache.cs	migrate from MemoryCache.Default to IMemoryCache	2022-05-18 19:07:09 +03:00
ICacheNotify.cs	added new license headers	2022-03-15 21:00:53 +03:00
KafkaCacheNotify.cs	add loggers	2022-05-06 12:40:38 +03:00
MemoryCacheNotify.cs	code cleanup	2022-04-14 22:42:15 +03:00
Protobuf.cs	merge from feature/backend-refactor	2022-03-29 23:29:03 +03:00
RabbitMQCache.cs	add loggers	2022-05-06 12:40:38 +03:00
RedisCacheNotify.cs	merge from feature/backend-refactor	2022-03-29 23:29:03 +03:00