Commit Graph

4 Commits

Author SHA1 Message Date
5bcbae5711 fix 2022-06-23 11:48:31 +03:00
03e756277b fixed warnings 2022-06-20 17:01:59 +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
a9b826f8f5 moved from ddf515b8 2022-06-09 18:36:57 +03:00