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.Api	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-04-21 18:54:28 +03:00
ASC.Web.Campaigns	Merge branch 'develop' into hotfix/campaigns-banner	2022-03-14 15:51:38 +05:00
ASC.Web.Client	Merge branch 'develop' into feature/doceditor-ssr	2022-04-28 14:12:06 +03:00
ASC.Web.Core	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2	2022-04-11 12:08:50 +03:00
ASC.Web.Editor	Merge branch 'develop' into feature/doceditor-ssr	2022-04-28 14:12:06 +03:00
ASC.Web.HealthChecks.UI	fixed warnings	2022-02-07 20:19:58 +03:00
ASC.Web.Login	Web: Login: fix style	2022-04-20 12:58:20 +03:00
ASC.Web.Studio	fixed warnings	2022-02-07 20:19:58 +03:00