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
..
ASC.Web.Api	fix auth via password	2021-02-26 22:32:03 +03:00
ASC.Web.Client	Merge branch 'master' into develop	2021-03-12 19:52:01 +03:00
ASC.Web.Common	Merge branch 'master' into develop	2021-03-12 19:52:01 +03:00
ASC.Web.Components	Merge branch 'master' into develop	2021-03-12 19:52:01 +03:00
ASC.Web.Core	CustomNamingPeople: fix	2021-03-12 18:01:11 +03:00
ASC.Web.Studio	Merge branch 'develop' into feature/not-implemented-page	2021-02-15 10:58:34 +03:00