Alexey Safronov 0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign ... # Conflicts: # packages/asc-web-components/modal-dialog/index.js # packages/asc-web-components/themes/dark.js # public/locales/de/Common.json # web/ASC.Web.Client/src/Shell.jsx # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js # web/ASC.Web.Login/src/Login.jsx		2022-03-16 11:03:07 +03:00
..
ASC.Web.Api	Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign	2022-03-16 11:03:07 +03:00
ASC.Web.Campaigns	Web: Campaigns: Added more locales	2022-03-02 17:43:10 +03:00
ASC.Web.Client	Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign	2022-03-16 11:03:07 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-01 13:50:26 +03:00
ASC.Web.Editor	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-01 13:50:26 +03:00
ASC.Web.HealthChecks.UI	fixed warnings	2022-02-07 20:19:58 +03:00
ASC.Web.Login	Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign	2022-03-16 11:03:07 +03:00
ASC.Web.Studio	fixed warnings	2022-02-07 20:19:58 +03:00