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 |
||
---|---|---|
.. | ||
Mappers | ||
ASC.AuditTrail.csproj | ||
AuditEvent.cs | ||
AuditEventsRepository.cs | ||
AuditReportCreator.cs | ||
AuditReportResource.de.resx | ||
AuditReportResource.Designer.cs | ||
AuditReportResource.es.resx | ||
AuditReportResource.fr.resx | ||
AuditReportResource.it.resx | ||
AuditReportResource.resx | ||
AuditReportResource.ru.resx | ||
BaseEvent.cs | ||
LoginEvent.cs | ||
LoginEventsRepository.cs |