pavelbannov
79ea471098
# Conflicts: # common/ASC.Api.Core/Core/BaseStartup.cs # common/ASC.Core.Common/BaseCommonLinkUtility.cs # common/services/ASC.ApiSystem/Startup.cs # common/services/ASC.Data.Backup/BackupServiceLauncher.cs # common/services/ASC.Data.Backup/Startup.cs # common/services/ASC.Data.Storage.Migration/Program.cs # common/services/ASC.Notify/NotifyServiceLauncher.cs # common/services/ASC.Notify/Program.cs # common/services/ASC.Socket.IO.Svc/Program.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Thumbnails.Svc/Program.cs # common/services/ASC.UrlShortener.Svc/Program.cs # products/ASC.Files/Core/Configuration/ProductEntryPoint.cs # products/ASC.Files/Server/Startup.cs # products/ASC.Files/Service/Program.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Startup.cs # web/ASC.Web.Studio/Startup.cs |
||
---|---|---|
.. | ||
Properties | ||
.gitignore | ||
appsettings.json | ||
ASC.Web.Studio.csproj | ||
Program.cs | ||
Startup.cs |