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
..
AppServerConfig.js	Added New Proxy settings	2021-04-05 15:49:02 +03:00
index.js	Web:Common:Constants: add new constant 'ThemeKeys'	2022-04-21 10:17:15 +03:00
sharedDependencies.js	Web: Doceditor: modified sharedDependencies	2022-02-24 17:43:46 +03:00