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
..
BackgroundTasks	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00
Client	Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS	2022-01-21 12:53:29 +03:00
Server	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00