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
..
public/locales	Add translations (vi)	2023-04-19 16:32:38 +03:00
scripts	Web: fix build	2023-02-06 19:15:04 +03:00
src	Merge branch 'master' into develop	2023-05-29 14:36:12 +03:00
webpack	Web: fix build	2023-02-06 19:15:04 +03:00
.babelrc	Web: Editor/Client: added ts support	2022-08-17 10:21:43 +03:00
.gitattributes	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
.gitignore	Web:Editor: add autoGeneratedTranslations.ts to gitignore file	2023-02-03 19:09:36 +03:00
babel.config.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
Dockerfile	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
jsconfig.json	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
package.json	Merge branch 'master' into develop	2023-05-29 14:36:12 +03:00