pavelbannov 8ea04bcc81 Merge branch 'develop' into feature/12.0 ... # Conflicts: # common/ASC.MessagingSystem/Data/MessagesRepository.cs # products/ASC.Files/Core/Utils/FileConverter.cs		2022-06-17 19:19:00 +03:00
..
ASC.Data.Encryption.csproj	Merge branch 'develop' into feature/net6	2021-10-22 16:10:37 +03:00
Crypt.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
CryptoStreamWrapper.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
IntegrityProtectionException.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Metadata.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
StreamWrapper.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00