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
..
Api	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
ApiModels/ResponseDto	moved from ddf515b8	2022-06-05 18:44:37 +03:00
Core	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Properties	moved from ddf515b8	2022-06-05 18:44:37 +03:00
Resources	moved from ddf515b8	2022-06-05 18:44:37 +03:00
ASC.Migration.csproj	moved from ddf515b8	2022-06-16 11:13:53 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/12.0	2022-06-17 19:19:00 +03:00
Program.cs	moved from ddf515b8	2022-06-08 12:02:40 +03:00
Startup.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00