Artem Tarasov 38e06018e5 Merge branch 'develop' into feature/doceditor-ssr ... # Conflicts: # packages/asc-web-common/api/client.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js # web/ASC.Web.Client/src/components/pages/Home/index.js # web/ASC.Web.Editor/src/Editor.jsx # web/ASC.Web.Editor/src/StyledEditor.js # yarn.lock		2022-04-28 14:12:06 +03:00
..
asc-web-common	Merge branch 'develop' into feature/doceditor-ssr	2022-04-28 14:12:06 +03:00
asc-web-components	Merge branch 'develop' into feature/doceditor-ssr	2022-04-28 14:12:06 +03:00
browserslist-config-asc	bump version to 1.1.1	2021-11-12 15:21:25 +03:00