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 |
||
---|---|---|
.. | ||
Billing | ||
Caching | ||
Configuration | ||
Context | ||
Core | ||
Data | ||
EF | ||
Encryption | ||
Migrations | ||
Notify | ||
Properties | ||
protos | ||
Security | ||
Settings | ||
Tenants | ||
Tests | ||
Users | ||
WhiteLabel | ||
ASC.Core.Common.csproj | ||
BaseCommonLinkUtility.cs | ||
GeolocationHelper.cs | ||
HostedSolution.cs | ||
MultiRegionHostedSolution.cs |