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
..
Client	Web: Files: Badges: Renamed VersionBadgeWrapper to BadgeWrapper	2022-01-26 15:16:45 +03:00
Core	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
Server	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
Service	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
Tests	fixed tests	2022-01-13 18:42:58 +03:00