pavelbannov 35e22fe8c8 Merge branch 'develop' into feature/fix-whitelable ... # Conflicts: # web/ASC.Web.Api/Api/Settings/WhitelabelController.cs # web/ASC.Web.Core/LogoUploader.cs # web/ASC.Web.Core/PublicResources/Resource.resx # web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs		2022-11-18 16:48:19 +03:00
..
AdditionalWhiteLabelSettings.cs	fix is default	2022-10-14 23:59:18 +03:00
CompanyWhiteLabelSettings.cs	fix is default	2022-10-14 23:59:18 +03:00
TenantInfoSettings.cs	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-02 11:16:29 +03:00
TenantLogoManager.cs	fix whitelabel	2022-11-15 14:11:44 +03:00
TenantWhiteLabelSettings.cs	Merge branch 'develop' into feature/fix-whitelable	2022-11-18 16:48:19 +03:00
WhiteLabelLogoTypeEnum.cs	fix whitelabel	2022-11-15 14:11:44 +03:00