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
..
FeedAggregateDataProvider.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
FeedDbContext.cs	IDE1006	2022-03-25 17:54:34 +03:00
FeedReadedDataProvider.cs	IDE1006	2022-03-25 19:26:06 +03:00