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
..
Core	moved from ddf515b8	2022-06-09 15:11:45 +03:00
Data	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Mapping	added new license headers	2022-03-15 21:00:53 +03:00
Migrations	added new license headers	2022-03-15 21:00:53 +03:00
Models	added new license headers	2022-03-15 21:00:53 +03:00
ASC.Feed.csproj	Csproj: ImplicitUsings	2022-03-05 11:20:05 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00