pavelbannov 79ea471098 Merge branch 'develop' into refactoring/scope ... # 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		2020-11-04 15:22:43 +03:00
..
AdditionalWhiteLabelSettings.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
CompanyWhiteLabelSettings.cs	connect-controlPanel: fix branding, backup and restore	2020-10-28 16:21:24 +03:00
TenantInfoSettings.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
TenantLogoManager.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
TenantWhiteLabelSettings.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
WhiteLabelLogoTypeEnum.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00