Commit Graph

3 Commits

Author SHA1 Message Date
60ee6a9d49 WhiteLabel: fixed support img types 2022-11-23 12:59:47 +03:00
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
b379931d1f fix whitelabel 2022-11-15 14:11:44 +03:00