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
..
public	Merge branch 'develop' into feature/workspaces	2021-01-22 11:24:16 +03:00
src	Merge branch 'develop' into feature/workspaces	2021-01-22 11:24:16 +03:00
.env	web: files: Fixed proxy configure for images and socketjs	2020-02-26 11:04:26 +03:00
.gitignore	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
analyse.js	Web: Files: Added Webpack-bundle-analyzer	2020-08-31 12:07:58 +03:00
config-overrides.js	yarn workspaces init commit	2020-11-21 16:07:23 +03:00
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
package.json	Bump version to v0.0.9	2021-01-18 19:06:31 +03:00
webpack.config.js	Web: Added support of public folders + moved back to original index.html	2020-12-15 19:27:30 +03:00