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
..
ASC.Web.Api	Merge branch 'develop' into feature/asc-files-tests	2020-12-29 18:37:28 +03:00
ASC.Web.Client	Merge branch 'develop' into feature/fix-hide/show-header	2021-01-13 13:27:55 +03:00
ASC.Web.Common	Merge branch 'develop' into feature/fix-hide/show-header	2021-01-13 13:27:55 +03:00
ASC.Web.Components	Merge branch 'develop' into feature/fix-hide/show-header	2021-01-13 13:27:55 +03:00
ASC.Web.Core	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
ASC.Web.Studio	fix create file	2020-11-26 20:30:57 +03:00