AlexeySafronov 789b547ccf Merge branch 'develop' into feature/workspaces ... # Conflicts: # packages/asc-web-components/src/components/icons/svg/icon_box.react.svg # packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg # packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg # packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg # packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg # packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg # packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg # packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg # packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg # packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg # products/ASC.Files/Client/package.json # products/ASC.Files/Client/src/App.js # products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js # products/ASC.Files/Client/src/components/pages/VersionHistory/index.js # products/ASC.Files/Client/src/store/files/actions.js # products/ASC.People/Client/package.json # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/package.json # web/ASC.Web.Client/src/App.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/yarn.lock # web/ASC.Web.Components/package.json # web/ASC.Web.Components/yarn.lock # yarn.lock		2021-01-22 11:24:16 +03:00
..
ASC.Web.Api	Merge branch 'develop' into feature/thirdparty-integrations	2021-01-11 12:37:31 +03:00
ASC.Web.Client	Merge branch 'develop' into feature/workspaces	2021-01-22 11:24:16 +03:00
ASC.Web.Core	Files: removed temp	2021-01-13 12:41:29 +03:00
ASC.Web.Login	Merge branch 'develop' into feature/workspaces	2021-01-11 12:21:59 +03:00
ASC.Web.Studio	fix create file	2020-11-26 20:30:57 +03:00