TatianaLopaeva 9bcb922c1a Merge branch 'develop' into feature/fix-hide/show-header ... # Conflicts: # products/ASC.Files/Client/src/App.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/Home/index.js # web/ASC.Web.Common/src/components/Layout/index.js # web/ASC.Web.Common/src/components/NavMenu/index.js # web/ASC.Web.Common/src/components/PageLayout/index.js # web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js # web/ASC.Web.Common/src/store/auth/actions.js # web/ASC.Web.Common/src/store/auth/reducer.js # web/ASC.Web.Common/src/store/auth/selectors.js		2021-01-13 13:27:55 +03:00
..
public	Merge branch 'develop' into feature/desktop-view	2020-12-30 16:20:47 +03:00
src	Merge branch 'develop' into feature/fix-hide/show-header	2021-01-13 13:27:55 +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	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
package.json	Bump version to v0.0.6	2020-12-29 19:43:37 +03:00
yarn.lock	Update yarn.lock files	2020-12-30 21:33:07 +03:00