AlexeySafronov 72527ccded Merge branch 'master' into develop ... # Conflicts: # lerna.json # package.json # packages/asc-web-common/package.json # packages/asc-web-components/package.json # products/ASC.CRM/Client/package.json # products/ASC.Calendar/Client/package.json # products/ASC.Files/Client/package.json # products/ASC.Mail/Client/package.json # products/ASC.People/Client/package.json # products/ASC.Projects/Client/package.json # web/ASC.Web.Client/package.json # web/ASC.Web.Editor/package.json # web/ASC.Web.Login/package.json		2021-05-29 21:57:42 +03:00
..
Client	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00
Server	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00