Commit Graph

2 Commits

Author SHA1 Message Date
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
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