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
..
AvatarPreview	Web: Combining avatar Editor and IconEditor components into one component and removing avatarEditor and IconEditor components	2023-01-04 15:28:52 +05:00
Dropzone	Merge branch 'master' into develop	2023-05-29 14:36:12 +03:00
ImageCropper	Web:Common/Client/Components: add PUBLIC_DIR alias	2023-01-27 17:08:30 +03:00
PreviewTile	Web:Moved the Tags component from the Common module to the Components module.	2023-05-25 16:12:45 +03:00
index.js	Web: Combining avatar Editor and IconEditor components into one component and removing avatarEditor and IconEditor components	2023-01-04 15:28:52 +05:00