5aa99ec811
# 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 |
||
---|---|---|
.. | ||
Caching | ||
Collections | ||
Data | ||
DependencyInjection | ||
Geolocation | ||
Logging | ||
Mapping | ||
Module | ||
Notify | ||
Properties | ||
protos | ||
Security | ||
Threading | ||
Utils | ||
Web | ||
ASC.Common.csproj | ||
ASC.Common.sln | ||
DIHelper.cs |