pavelbannov 7f1d946269 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/Shell.jsx # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js # packages/client/src/pages/PortalSettings/index.js # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Core/HttpHandlers/SsoHandler.cs		2022-09-23 16:11:23 +03:00
..
ASC.Web.Api	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
ASC.Web.HealthChecks.UI	warm up services	2022-08-08 19:25:22 +03:00
ASC.Web.Studio	nlog: refactoring service name	2022-09-16 16:41:51 +03:00