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
DocStore@2bb4d878b4	Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout	2022-03-18 11:05:58 +03:00
Helpers	moved from ddf515b8	2022-06-14 11:11:41 +03:00
Log	add loggers	2022-05-12 11:14:00 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	moved from ddf515b8	2022-06-05 18:44:37 +03:00
GlobalUsings.cs	add loggers	2022-05-12 11:14:00 +03:00
ProductEntryPoint.cs	refactoring: remove IServiceProvider	2022-03-31 20:32:46 +03:00
Program.cs	thumbnails, notify, telegram: migrate from ICacheNotify to EventBus	2022-05-13 22:14:00 +03:00
Startup.cs	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00