Artem Tarasov 2ef94f75da Merge branch 'develop' into feature/doceditor-ssr ... # Conflicts: # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # web/ASC.Web.Editor/package.json # web/ASC.Web.Editor/src/Editor.jsx # web/ASC.Web.Editor/webpack.config.js # yarn.lock		2022-07-01 23:41:10 +03:00
..
ASC.Calendar	Merge branch 'release/v1.2' into develop	2022-06-30 16:13:31 +03:00
ASC.CRM	crm: fix logs	2022-05-31 18:34:04 +03:00
ASC.Files	Merge branch 'develop' into feature/doceditor-ssr	2022-07-01 23:41:10 +03:00
ASC.Mail	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00
ASC.People	Merge branch 'release/v1.2' into develop	2022-06-30 16:13:31 +03:00
ASC.Projects	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00