Vashchuk Nikita 5aa99ec811 Merge branch 'develop' into feature/async ... # Conflicts: # common/ASC.Common/Caching/KafkaCache.cs # common/ASC.Data.Backup.Core/Storage/BackupRepository.cs # common/services/ASC.AuditTrail/AuditEventsRepository.cs # common/services/ASC.AuditTrail/LoginEventsRepository.cs # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Utils/MailMergeTask.cs # products/ASC.Files/Server/ASC.Files.csproj # products/ASC.Files/Service/Thumbnail/FileDataProvider.cs		2022-02-04 16:04:52 +03:00
..
AscCache.cs	microsoft recomended store the System.Guid type as string type in protobuf format	2021-12-23 18:29:35 +03:00
CacheNotifyAction.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
ICache.cs	MemoryCache -> IMemoryCache	2021-01-12 20:51:14 +03:00
ICacheNotify.cs	Added async in Asc.Files.Core(Dao)	2021-10-21 20:59:05 +03:00
KafkaCache.cs	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
MemoryCacheNotify.cs	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
Protobuf.cs	fix-messages: IDE0022	2020-09-30 17:47:42 +03:00
RedisCache.cs	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00