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
..
Client/src	Web: Added prop type.	2022-08-11 15:55:46 +03:00
Core	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
Server	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
Service	Merge branch 'develop' into feature/stripe	2022-09-19 18:16:34 +03:00
Tests	packages updated	2022-08-01 13:58:12 +03:00