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.Calendar	Web:Products: change 'pagelayout' component to 'section' component	2022-03-17 16:20:53 +03:00
ASC.CRM	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2	2022-03-21 17:15:55 +03:00
ASC.Files	Merge branch 'develop' into feature/doceditor-ssr	2022-04-28 14:12:06 +03:00
ASC.Mail	Web:Products: change 'pagelayout' component to 'section' component	2022-03-17 16:20:53 +03:00
ASC.People	Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme	2022-04-21 18:55:41 +03:00
ASC.Projects	Web:Products: change 'pagelayout' component to 'section' component	2022-03-17 16:20:53 +03:00