82abf11109
# 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 |
||
---|---|---|
.. | ||
CalendarAddonResource.de.resx | ||
CalendarAddonResource.Designer.cs | ||
CalendarAddonResource.es.resx | ||
CalendarAddonResource.fr.resx | ||
CalendarAddonResource.it.resx | ||
CalendarAddonResource.resx | ||
CalendarAddonResource.ru.resx | ||
CalendarApiResource.Designer.cs | ||
CalendarApiResource.resx | ||
CalendarResource.Designer.cs | ||
CalendarResource.resx | ||
CalendarResource.ru.resx |