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
..
launchSettings.json	Merge branch 'develop' into feature/calendar	2021-05-18 13:24:02 +03:00