Vashchuk Nikita 82abf11109 Merge branch 'develop' into feature/calendar ... # Conflicts: # ASC.Web.sln # config/autofac.products.json # config/nginx/onlyoffice.conf # products/ASC.Calendar/Server/ASC.Calendar.csproj # products/ASC.Calendar/Server/Controllers/CalendarController.cs # products/ASC.Calendar/Server/Program.cs # products/ASC.Calendar/Server/Properties/launchSettings.json # products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs # products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx # products/ASC.Calendar/Server/Startup.cs		2021-05-18 13:24:02 +03:00
..
ASC.ApiSystem	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.AuditTrail	from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects	2021-04-30 18:42:10 +03:00
ASC.Data.Backup	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.Data.Storage.Encryption	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.Data.Storage.Migration	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.ElasticSearch	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
ASC.Feed.Aggregator	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.Notify	removed unused newtonsoft.json	2021-05-06 12:20:37 +03:00
ASC.Radicale	Fix Calendar	2021-05-17 21:35:23 +03:00
ASC.Socket.IO.Svc	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.Studio.Notify	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.TelegramService	removed unused newtonsoft.json	2021-05-06 12:20:37 +03:00
ASC.Thumbnails.Svc	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.UrlShortener.Svc	removed unused newtonsoft.json	2021-05-06 12:20:37 +03:00