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
..
Mappers	Code cleanup	2020-11-17 13:00:01 +03:00
ASC.AuditTrail.csproj	net6	2021-08-25 18:26:13 +03:00
AuditEvent.cs	ASC.AuditTrail: fix	2020-10-06 15:12:57 +03:00
AuditEventsRepository.cs	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
AuditReportCreator.cs	spreading async in Files	2021-12-28 18:15:29 +03:00
AuditReportResource.de.resx	WebStudio: resources	2021-05-27 21:30:15 +03:00
AuditReportResource.Designer.cs	WebStudio: resources	2021-05-27 21:30:15 +03:00
AuditReportResource.es.resx	WebStudio: resources	2021-05-27 21:30:15 +03:00
AuditReportResource.fr.resx	WebStudio: resources	2021-05-27 21:30:15 +03:00
AuditReportResource.it.resx	WebStudio: resources	2021-05-27 21:30:15 +03:00
AuditReportResource.resx	WebStudio: resources	2021-05-27 21:30:15 +03:00
AuditReportResource.ru.resx	WebStudio: resources	2021-05-27 21:30:15 +03:00
BaseEvent.cs	Code cleanup	2020-11-17 13:00:01 +03:00
LoginEvent.cs	ASC.AuditTrail: fix	2020-10-06 15:12:57 +03:00
LoginEventsRepository.cs	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00