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
..
Controllers	async methods for httpClient in ASC.Web	2022-01-31 17:35:36 +03:00
DocStore@2bb4d878b4	Merge branch 'develop' into component-tooltips	2022-01-20 15:45:24 +03:00
Helpers	ILinkDao, fix	2022-01-18 19:50:31 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
ProductEntryPoint.cs	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
Program.cs	add *.dll for support redis + update Grpc.* dll	2021-12-23 16:17:31 +03:00
Startup.cs	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00