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
..
ASC.Web.Api	Merge branch 'develop' into feature/fix-whitelable	2022-11-18 16:48:19 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/fix-whitelable	2022-11-18 16:48:19 +03:00
ASC.Web.HealthChecks.UI	healthcheck: added to ApiSystem/ClearEvents services. refactoring	2022-10-31 16:13:45 +03:00
ASC.Web.Studio	fix ide001	2022-11-07 12:49:29 +03:00