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
..
SmsKeyStorage.cs	Auth: check tfa	2021-04-26 14:56:38 +03:00
SmsManager.cs	async methods for httpClient in ASC.Web	2022-01-31 17:35:36 +03:00
SmsProvider.cs	Merge branch 'develop' into feature/async	2022-02-04 16:04:52 +03:00
SmsSender.cs	async methods for httpClient in ASC.Web	2022-01-31 17:35:36 +03:00
StudioSmsNotificationSettings.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00