Ilya Oleshko 19e8b2210a Merge branch 'master' into develop ... # Conflicts: # packages/client/src/helpers/constants.js # packages/client/src/pages/AccountsHome/Section/Filter/index.js # packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js # packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js # packages/client/src/pages/Home/Section/Header/index.js # packages/client/src/pages/Home/index.js # packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js # packages/client/src/pages/PortalSettings/categories/common/branding.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js # packages/client/src/store/FilesActionsStore.js # packages/common/components/Article/sub-components/article-payment-alert.js # packages/common/components/Section/index.js # packages/components/floating-button/styled-floating-button.js # packages/login/src/client/App.tsx # packages/login/src/client/components/Invalid/index.tsx # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Utils/FileConverter.cs # yarn.lock		2023-05-29 14:36:12 +03:00
..
sub-components	Merge branch 'master' into develop	2023-05-29 14:36:12 +03:00
index.js	Web: Added offset, lable, color, z-index for Zendesk widget	2023-04-06 18:56:36 +04:00
styled-article.js	Web: Article: Fixed alerts styles.	2023-04-04 16:36:07 +03:00