DocSpace-client/products
Alexey Safronov 84810de125 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-components/context-menu/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
2022-03-05 17:52:01 +03:00
..
ASC.Calendar Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00
ASC.CRM Merge branch 'develop' into feature/async 2022-02-23 16:01:55 +03:00
ASC.Files Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-05 17:52:01 +03:00
ASC.Mail Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00
ASC.People Web:People:Filter: add search placeholder 2022-03-05 16:59:05 +03:00
ASC.Projects Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00