AlexeySafronov 4d5ca86a74 Merge branch 'master' into develop ... # Conflicts: # products/ASC.Files/Client/yarn.lock # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/.env # web/ASC.Web.Client/src/App.js # web/ASC.Web.Client/src/helpers/i18n.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/src/api/modules/index.js # web/ASC.Web.Common/src/store/auth/reducer.js # web/ASC.Web.Common/yarn.lock # web/ASC.Web.Components/yarn.lock		2021-03-12 19:52:01 +03:00
..
public	Merge branch 'develop' into feature/mobx	2021-02-20 17:31:58 +03:00
src	Merge branch 'develop' into feature/mobx	2021-02-20 17:31:58 +03:00
.env	web: clients: Fixed CRA proxy bug;	2020-02-26 10:02:37 +03:00
.gitignore
analyse.js	Web: People: Added Webpack-bundle-analyzer	2020-08-31 11:59:35 +03:00
package.json	Merge branch 'master' into develop	2021-03-12 19:52:01 +03:00
yarn.lock	Merge branch 'master' into develop	2021-03-12 19:52:01 +03:00